Explorar el Código

//分账

release_toaliyun_real
xhxu hace 3 años
padre
commit
d025b642b2
Se han modificado 1 ficheros con 4 adiciones y 2 borrados
  1. +4
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java

+ 4
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java Ver fichero

@@ -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()+"\"]配置收款账户错误,只能配置支付宝.");
}


Cargando…
Cancelar
Guardar