| @@ -84,7 +84,7 @@ public interface WxCouponChannelService { | |||||
| ResultData updateOnline(WxCouponChannel wxCouponChannel); | ResultData updateOnline(WxCouponChannel wxCouponChannel); | ||||
| Long getCouponOneMerchantId(EnumPayWay payWay,Integer payVersion, Long couponChannelId, String tenantId); | |||||
| Long getCouponOneMerchantId(EnumPayWay payWay,Long couponChannelId, String tenantId); | |||||
| String getCouponOneMerchantUid(EnumPayWay payWay,Long merchantId, String tenantId); | String getCouponOneMerchantUid(EnumPayWay payWay,Long merchantId, String tenantId); | ||||
| @@ -855,7 +855,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { | |||||
| WxProfitSharingReceiver psReceiverQ = new WxProfitSharingReceiver(); | WxProfitSharingReceiver psReceiverQ = new WxProfitSharingReceiver(); | ||||
| psReceiverQ.setTenantId(tenantId); | psReceiverQ.setTenantId(tenantId); | ||||
| psReceiverQ.setMerchantId(merchantId); | psReceiverQ.setMerchantId(merchantId); | ||||
| psReceiverQ.setSharingType(payServiceFactory.getPayShareAdapterService(payWay.getCode()).getProfitSharingType()); | |||||
| // psReceiverQ.setSharingType(payServiceFactory.getPayShareAdapterService(payWay.getCode()).getProfitSharingType()); | |||||
| psReceiverQ.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); | psReceiverQ.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); | ||||
| psReceiverQ.setPlat(payWay.getPlat().getCode()); | psReceiverQ.setPlat(payWay.getPlat().getCode()); | ||||
| List<WxProfitSharingReceiver> psReceiverList = wxProfitSharingReceiverMapper.findList(psReceiverQ); | List<WxProfitSharingReceiver> psReceiverList = wxProfitSharingReceiverMapper.findList(psReceiverQ); | ||||
| @@ -455,7 +455,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||||
| Long merchant_id = null; | Long merchant_id = null; | ||||
| String merchant_uid = ""; | String merchant_uid = ""; | ||||
| if(EnumPayMchType.DIRECT.equals(payMchType)){//直连模式记录收款商户 | 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()); | merchant_uid = wxCouponChannelService.getCouponOneMerchantUid(payWay,merchant_id,o.getTenantId()); | ||||
| if(StringUtils.isBlank(merchant_uid)){ | if(StringUtils.isBlank(merchant_uid)){ | ||||
| throw new MallinkException(ErrorCode.PAY_ORDER_MERCHANT_UID_ERROR); | throw new MallinkException(ErrorCode.PAY_ORDER_MERCHANT_UID_ERROR); | ||||