diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java index 5eff9e97a..c680ae053 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponChannelService.java @@ -84,7 +84,7 @@ public interface WxCouponChannelService { 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); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java index 5158e4ae1..cd98d09ac 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -855,7 +855,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { WxProfitSharingReceiver psReceiverQ = new WxProfitSharingReceiver(); psReceiverQ.setTenantId(tenantId); 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.setPlat(payWay.getPlat().getCode()); List psReceiverList = wxProfitSharingReceiverMapper.findList(psReceiverQ); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index a72a5f502..4aa40bf6b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -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);