Commit d4e302cc authored by zhuxiao's avatar zhuxiao
Browse files

修改微信支付 subMchId为空时,不上传此参数

parent 733a6474
...@@ -27,6 +27,7 @@ import com.jeequan.jeepay.pay.rqrs.AbstractRS; ...@@ -27,6 +27,7 @@ import com.jeequan.jeepay.pay.rqrs.AbstractRS;
import com.jeequan.jeepay.pay.rqrs.payorder.UnifiedOrderRQ; import com.jeequan.jeepay.pay.rqrs.payorder.UnifiedOrderRQ;
import com.jeequan.jeepay.pay.util.PaywayUtil; import com.jeequan.jeepay.pay.util.PaywayUtil;
import com.jeequan.jeepay.pay.model.MchAppConfigContext; import com.jeequan.jeepay.pay.model.MchAppConfigContext;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/* /*
...@@ -93,7 +94,9 @@ public class WxpayPaymentService extends AbstractPaymentService { ...@@ -93,7 +94,9 @@ public class WxpayPaymentService extends AbstractPaymentService {
if(mchAppConfigContext.isIsvsubMch()){ if(mchAppConfigContext.isIsvsubMch()){
WxpayIsvsubMchParams isvsubMchParams = mchAppConfigContext.getIsvsubMchParamsByIfCode(getIfCode(), WxpayIsvsubMchParams.class); WxpayIsvsubMchParams isvsubMchParams = mchAppConfigContext.getIsvsubMchParamsByIfCode(getIfCode(), WxpayIsvsubMchParams.class);
request.setSubMchId(isvsubMchParams.getSubMchId()); request.setSubMchId(isvsubMchParams.getSubMchId());
request.setSubAppId(isvsubMchParams.getSubMchAppId()); if (StringUtils.isNotBlank(isvsubMchParams.getSubMchAppId())) {
request.setSubAppId(isvsubMchParams.getSubMchAppId());
}
} }
return request; return request;
...@@ -128,7 +131,9 @@ public class WxpayPaymentService extends AbstractPaymentService { ...@@ -128,7 +131,9 @@ public class WxpayPaymentService extends AbstractPaymentService {
reqJSON.put("sp_appid", wxPayService.getConfig().getAppId()); reqJSON.put("sp_appid", wxPayService.getConfig().getAppId());
reqJSON.put("sp_mchid", wxPayService.getConfig().getMchId()); reqJSON.put("sp_mchid", wxPayService.getConfig().getMchId());
reqJSON.put("sub_mchid", isvsubMchParams.getSubMchId()); reqJSON.put("sub_mchid", isvsubMchParams.getSubMchId());
reqJSON.put("sub_appid", isvsubMchParams.getSubMchAppId()); if (StringUtils.isNotBlank(isvsubMchParams.getSubMchAppId())) {
reqJSON.put("sub_appid", isvsubMchParams.getSubMchAppId());
}
}else { // 普通商户 }else { // 普通商户
reqJSON.put("appid", wxPayService.getConfig().getAppId()); reqJSON.put("appid", wxPayService.getConfig().getAppId());
reqJSON.put("mchid", wxPayService.getConfig().getMchId()); reqJSON.put("mchid", wxPayService.getConfig().getMchId());
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment