소스 검색

//分账

release_toaliyun_real
xhxu 3 년 전
부모
커밋
d025b642b2
1개의 변경된 파일4개의 추가작업 그리고 2개의 파일을 삭제
  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 파일 보기

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


불러오는 중...
취소
저장