From 41c3b0fecfa6ef36fa96984451291702c6dd02a8 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 22 Nov 2021 15:58:04 +0800 Subject: [PATCH] update refund --- .../com/iformall/service/impl/WxCouponOrderServiceImpl.java | 1 + .../java/com/iformall/service/impl/WxCouponServiceImpl.java | 3 +++ .../java/com/iformall/service/impl/WxOrderServiceImpl.java | 1 + .../com/iformall/service/impl/WxRefundOrderServiceImpl.java | 1 + 4 files changed, 6 insertions(+) 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 2ddae1cb9..d40118e9b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -1509,6 +1509,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { // 2. 检查适用门店 WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); + wxCouponMerchant.updateTenantInfo(wxCoupon); wxCouponMerchant.setProductId(wxCoupon.getId()); wxCouponMerchant.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); List couponMerchantList = wxCouponMerchantMapper.findList(wxCouponMerchant); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 5efba2ea6..8aa02da01 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -439,6 +439,7 @@ public class WxCouponServiceImpl implements WxCouponService { WxCouponMerchant cm = new WxCouponMerchant(); WxCouponMerchantDto wxCouponMerchantDto = parseMerchantParam(merchantParam); cm.setId(idWorker.nextId()); + cm.updateTenantInfo(record); cm.setMerchantId(wxCouponMerchantDto.getMerchantId()); cm.setParameter(wxCouponMerchantDto.getParameter()); cm.setProductId(record.getId()); @@ -508,12 +509,14 @@ public class WxCouponServiceImpl implements WxCouponService { } if (merchantParamList != null && merchantParamList.size() > 0) { WxCouponMerchant cmParam = new WxCouponMerchant(); + cmParam.updateTenantInfo(record); cmParam.setProductId(record.getId()); List oldList = wxCouponMerchantMapper.findList(cmParam); List wxCouponMerchantDtoList = new ArrayList<>(); merchantParamList.stream().forEach(merchantParam -> { WxCouponMerchant cm = new WxCouponMerchant(); WxCouponMerchantDto wxCouponMerchantDto = parseMerchantParam(merchantParam); + cm.updateTenantInfo(record); cm.setMerchantId(wxCouponMerchantDto.getMerchantId()); cm.setProductId(record.getId()); WxCouponMerchant rcm = wxCouponMerchantMapper.selectOne(new QueryWrapper<>(cm)); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 8d624923c..4936e1e08 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1613,6 +1613,7 @@ public class WxOrderServiceImpl implements WxOrderService { */ private void setMerchantId(WxCoupon coupon, WxCreditHistory creditHistory) { WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); + wxCouponMerchant.updateTenantInfo(coupon); wxCouponMerchant.setProductId(coupon.getId()); wxCouponMerchant.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); List list = wxCouponMerchantMapper.findList(wxCouponMerchant); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java index 35b9c89e1..afdde86ce 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java @@ -95,6 +95,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { //如券包就没有商户 if (EnumCouponType.mustHasMerchant(wxCoupon.getType())) { WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); + wxCouponMerchant.updateTenantInfo(wxCoupon); wxCouponMerchant.setProductId(wxCoupon.getId()); wxCouponMerchant.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); List couponMerchantList = wxCouponMerchantMapper.findList(wxCouponMerchant);