| @@ -602,6 +602,7 @@ public class WxCouponServiceImpl implements WxCouponService { | |||||
| record.setMakeMerchantId(makeMerchant.getId()); | record.setMakeMerchantId(makeMerchant.getId()); | ||||
| WxProfitSharingReceiver receiver = payShareServie.getReceiver(payAccount, makeMerchant.getId(), null, payMchType.getCode()); | WxProfitSharingReceiver receiver = payShareServie.getReceiver(payAccount, makeMerchant.getId(), null, payMchType.getCode()); | ||||
| logger.info(JSON.toJSONString(receiver)); | |||||
| if (receiver == null) { | if (receiver == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "[\""+makeMerchant.getName()+"\"]未配置收款账户"); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "[\""+makeMerchant.getName()+"\"]未配置收款账户"); | ||||
| } | } | ||||
| @@ -616,12 +617,14 @@ public class WxCouponServiceImpl implements WxCouponService { | |||||
| List<String> badNames = new ArrayList(); | List<String> badNames = new ArrayList(); | ||||
| for (WxMerchant merchant:merchantList) { | for (WxMerchant merchant:merchantList) { | ||||
| WxProfitSharingReceiver receiver = payShareServie.getReceiver(payAccount, merchant.getId(), null, payMchType.getCode()); | WxProfitSharingReceiver receiver = payShareServie.getReceiver(payAccount, merchant.getId(), null, payMchType.getCode()); | ||||
| logger.info(JSON.toJSONString(receiver)); | |||||
| if (receiver == null) { | if (receiver == null) { | ||||
| badNames.add(merchant.getName()); | badNames.add(merchant.getName()); | ||||
| continue; | continue; | ||||
| } | } | ||||
| if (EnumAppPlat.TOUTIAO.equals(plat)) { | if (EnumAppPlat.TOUTIAO.equals(plat)) { | ||||
| QueryMerchantResult openPayResult = payAccount.getOpenPayResult(); | QueryMerchantResult openPayResult = payAccount.getOpenPayResult(); | ||||
| logger.info(JSON.toJSONString(openPayResult)); | |||||
| if(!EnumYesOrNo.YES.getCode().equals(openPayResult.getAlipay()) | if(!EnumYesOrNo.YES.getCode().equals(openPayResult.getAlipay()) | ||||
| && !EnumYesOrNo.YES.getCode().equals(openPayResult.getWx()) | && !EnumYesOrNo.YES.getCode().equals(openPayResult.getWx()) | ||||
| && !EnumYesOrNo.YES.getCode().equals(openPayResult.getHz())){ | && !EnumYesOrNo.YES.getCode().equals(openPayResult.getHz())){ | ||||