diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxPayAccountController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxPayAccountController.java index 9c21004d0..59c1115ed 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxPayAccountController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxPayAccountController.java @@ -40,12 +40,11 @@ public class WxPayAccountController extends BaseController { public ResultData getPayAccount(@RequestBody Map paramMap) { logger.info("/api/payAccount/getPayAccount" + paramMap.toString()); String appId = paramMap.get("appId"); - String tenantId = paramMap.get("tenantId"); - if (StringUtils.isBlank(appId) || StringUtils.isBlank(tenantId)) { + if (StringUtils.isBlank(appId)) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - WxAppinfo wxAppinfo = getAppInfo(appId,tenantId); + WxAppinfo wxAppinfo = getAppInfo(appId,getTenantInfo().getTenantId()); if(wxAppinfo == null){ return new ResultData(ErrorCode.APP_ID_NOT_FOUND); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index c146aad22..b257c4611 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -1338,12 +1338,20 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { throw new MallinkException(ErrorCode.COUPON_ORDER_IS_PRE_VERIFY); } + //核销tenant + TenantEntity mallTenantEntity = new TenantEntity(); + if(bUser != null){ + mallTenantEntity.updateTenantInfo(bUser); + }else{ + mallTenantEntity.updateTenantInfo(wxCoupon); + } + // 2. 检查适用门店 Long merchantId = null; if(EnumCouponType.COUPON_DISTRIBUTION.getCode().equals(wxCoupon.getType())){ //可配送商品 WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); - wxCouponMerchant.updateTenantInfo(bUser); + wxCouponMerchant.updateTenantInfo(mallTenantEntity); wxCouponMerchant.setProductId(wxCoupon.getId()); wxCouponMerchant.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); WxCouponMerchant cm = null; @@ -1392,7 +1400,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { if(wxPayOrder != null && EnumPayMchType.TOTAL.getCode().equals(wxPayOrder.getMchType()) && EnumPayShare.YES.getCode().equals(wxPayOrder.getShare())){ WxProfitSharingReceiver receiver = payServiceFactory.getPayShareAdapterService(wxPayOrder.getPayVendor(),couponOrder.getPayVersion()) - .getReceiver(bUser, merchantId, wxPayOrder.getTtPayWay(),wxPayOrder.getMchType()); + .getReceiver(mallTenantEntity, merchantId, wxPayOrder.getTtPayWay(),wxPayOrder.getMchType()); if (null == receiver) { throw new MallinkException(ErrorCode.VERIFY_COUPON_ORDER_MERCHANT_IS_NULL.getCode(),"当前商户没有配置收款账号。"); }