From 2e12be56e6b5040b6ce2aafb0f10cba3cb61dce1 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 14 Oct 2022 14:26:58 +0800 Subject: [PATCH] =?UTF-8?q?//ttpay=20=E5=88=86=E8=B4=A6=E5=B8=90=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxCouponServiceImpl.java | 5 ++--- .../service/impl/WxProfitSharingReceiverServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index a66a9eb43..9399ddf86 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -602,7 +602,6 @@ public class WxCouponServiceImpl implements WxCouponService { record.setMakeMerchantId(makeMerchant.getId()); WxProfitSharingReceiver receiver = payShareServie.getReceiver(payAccount, makeMerchant.getId(), null, payMchType.getCode()); - logger.info(JSON.toJSONString(receiver)); if (receiver == null) { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "[\""+makeMerchant.getName()+"\"]未配置收款账户"); } @@ -617,14 +616,14 @@ public class WxCouponServiceImpl implements WxCouponService { List badNames = new ArrayList(); for (WxMerchant merchant:merchantList) { WxProfitSharingReceiver receiver = payShareServie.getReceiver(payAccount, merchant.getId(), null, payMchType.getCode()); - logger.info(JSON.toJSONString(receiver)); + if (receiver == null) { badNames.add(merchant.getName()); continue; } if (EnumAppPlat.TOUTIAO.equals(plat)) { QueryMerchantResult openPayResult = payAccount.getOpenPayResult(); - logger.info(JSON.toJSONString(openPayResult)); + if(!EnumYesOrNo.YES.getCode().equals(openPayResult.getAlipay()) && !EnumYesOrNo.YES.getCode().equals(openPayResult.getWx()) && !EnumYesOrNo.YES.getCode().equals(openPayResult.getHz())){ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java index a8efe0b77..8fe0845e4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProfitSharingReceiverServiceImpl.java @@ -481,7 +481,7 @@ public class WxProfitSharingReceiverServiceImpl implements WxProfitSharingReceiv if(receiver != null){ String key = Constant.sharingReceicerPrev + receiver.getTenantId() + ":" + receiver.getMerchantId() - + ":" + receiver.getPlat() + "a" + receiver.getReceiverType(); + + ":" + receiver.getPlat() + "a" + receiver.getSharingType(); RedisCacheUtils.removeCache(sharingReceicerRedisTemplate, key); } }