|
|
|
@@ -455,7 +455,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { |
|
|
|
Long merchant_id = null; |
|
|
|
String merchant_uid = ""; |
|
|
|
if(EnumPayMchType.DIRECT.equals(payMchType)){//直连模式记录收款商户 |
|
|
|
merchant_id = wxCouponChannelService.getCouponOneMerchantId(payWay,,payAccount.getPayVersion(),o.getCouponChannelId(),o.getTenantId()); |
|
|
|
merchant_id = wxCouponChannelService.getCouponOneMerchantId(payWay,o.getCouponChannelId(),o.getTenantId()); |
|
|
|
merchant_uid = wxCouponChannelService.getCouponOneMerchantUid(payWay,merchant_id,o.getTenantId()); |
|
|
|
if(StringUtils.isBlank(merchant_uid)){ |
|
|
|
throw new MallinkException(ErrorCode.PAY_ORDER_MERCHANT_UID_ERROR); |
|
|
|
|