|
|
@@ -1266,7 +1266,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
if(EnumCouponType.COUPON_DISTRIBUTION.getCode().equals(wxCoupon.getType())){ |
|
|
if(EnumCouponType.COUPON_DISTRIBUTION.getCode().equals(wxCoupon.getType())){ |
|
|
//可配送商品 |
|
|
//可配送商品 |
|
|
WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); |
|
|
WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); |
|
|
wxCouponMerchant.updateTenantInfo(wxCoupon); |
|
|
|
|
|
|
|
|
wxCouponMerchant.updateTenantInfo(bUser); |
|
|
wxCouponMerchant.setProductId(wxCoupon.getId()); |
|
|
wxCouponMerchant.setProductId(wxCoupon.getId()); |
|
|
wxCouponMerchant.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); |
|
|
wxCouponMerchant.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); |
|
|
WxCouponMerchant cm = null; |
|
|
WxCouponMerchant cm = null; |
|
|
@@ -1295,7 +1295,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
throw new MallinkException(ErrorCode.VERIFY_COUPON_TYPE_NOT_SUPPORT); |
|
|
throw new MallinkException(ErrorCode.VERIFY_COUPON_TYPE_NOT_SUPPORT); |
|
|
} |
|
|
} |
|
|
WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); |
|
|
WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); |
|
|
wxCouponMerchant.updateTenantInfo(wxCoupon); |
|
|
|
|
|
|
|
|
wxCouponMerchant.updateTenantInfo(bUser); |
|
|
wxCouponMerchant.setProductId(wxCoupon.getId()); |
|
|
wxCouponMerchant.setProductId(wxCoupon.getId()); |
|
|
wxCouponMerchant.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); |
|
|
wxCouponMerchant.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); |
|
|
List<WxCouponMerchant> couponMerchantList = wxCouponMerchantMapper.findList(wxCouponMerchant); |
|
|
List<WxCouponMerchant> couponMerchantList = wxCouponMerchantMapper.findList(wxCouponMerchant); |
|
|
@@ -1315,7 +1315,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
if(wxPayOrder != null && EnumPayMchType.TOTAL.getCode().equals(wxPayOrder.getMchType()) |
|
|
if(wxPayOrder != null && EnumPayMchType.TOTAL.getCode().equals(wxPayOrder.getMchType()) |
|
|
&& EnumPayShare.YES.getCode().equals(wxPayOrder.getShare())){ |
|
|
&& EnumPayShare.YES.getCode().equals(wxPayOrder.getShare())){ |
|
|
WxProfitSharingReceiver receiver = payServiceFactory.getPayShareAdapterService(wxPayOrder.getPayVendor(),couponOrder.getPayVersion()) |
|
|
WxProfitSharingReceiver receiver = payServiceFactory.getPayShareAdapterService(wxPayOrder.getPayVendor(),couponOrder.getPayVersion()) |
|
|
.getReceiver(couponOrder, merchantId, wxPayOrder.getTtPayWay(),wxPayOrder.getMchType()); |
|
|
|
|
|
|
|
|
.getReceiver(bUser, merchantId, wxPayOrder.getTtPayWay(),wxPayOrder.getMchType()); |
|
|
if (null == receiver) { |
|
|
if (null == receiver) { |
|
|
throw new MallinkException(ErrorCode.VERIFY_COUPON_ORDER_MERCHANT_IS_NULL.getCode(),"当前商户没有配置收款账号。"); |
|
|
throw new MallinkException(ErrorCode.VERIFY_COUPON_ORDER_MERCHANT_IS_NULL.getCode(),"当前商户没有配置收款账号。"); |
|
|
} |
|
|
} |
|
|
|