From d025b642b2a29fb1b8a3b4c4c9ad17c7f4a29c86 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 12 May 2023 13:51:55 +0800 Subject: [PATCH] =?UTF-8?q?//=E5=88=86=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxCouponServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 7e10a1416..c86cf937e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -1016,7 +1016,8 @@ public class WxCouponServiceImpl implements WxCouponService { QueryMerchantResult openPayResult = payAccount.getOpenPayResult(); if(!EnumYesOrNo.YES.getCode().equals(openPayResult.getAlipay()) || EnumYesOrNo.YES.getCode().equals(openPayResult.getWx()) - || EnumYesOrNo.YES.getCode().equals(openPayResult.getHz())){ +// || EnumYesOrNo.YES.getCode().equals(openPayResult.getHz()) + ){ throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "分账模式设置错误"); } if(!MerchantImportStatus.improt_success.getCode().equals(receiver.getAlipayImportStatus())){ @@ -1671,7 +1672,8 @@ public class WxCouponServiceImpl implements WxCouponService { if(EnumCouponMerchantType.MULTIPLE_MERCHANT.getCode().equals(wxCoupon.getMerchantType())){ if (MerchantImportStatus.improt_success.getCode().equals(receiver.getAlipayImportStatus()) && !MerchantImportStatus.improt_success.getCode().equals(receiver.getWxImportStatus()) - && !MerchantImportStatus.improt_success.getCode().equals(receiver.getHzImportStatus())) { +// && !MerchantImportStatus.improt_success.getCode().equals(receiver.getHzImportStatus()) + ) { }else { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "所属商户[\""+makeMerchant.getName()+"\"]配置收款账户错误,只能配置支付宝."); }