| @@ -1509,6 +1509,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| // 2. 检查适用门店 | // 2. 检查适用门店 | ||||
| WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); | WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); | ||||
| wxCouponMerchant.updateTenantInfo(wxCoupon); | |||||
| 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); | ||||
| @@ -439,6 +439,7 @@ public class WxCouponServiceImpl implements WxCouponService { | |||||
| WxCouponMerchant cm = new WxCouponMerchant(); | WxCouponMerchant cm = new WxCouponMerchant(); | ||||
| WxCouponMerchantDto wxCouponMerchantDto = parseMerchantParam(merchantParam); | WxCouponMerchantDto wxCouponMerchantDto = parseMerchantParam(merchantParam); | ||||
| cm.setId(idWorker.nextId()); | cm.setId(idWorker.nextId()); | ||||
| cm.updateTenantInfo(record); | |||||
| cm.setMerchantId(wxCouponMerchantDto.getMerchantId()); | cm.setMerchantId(wxCouponMerchantDto.getMerchantId()); | ||||
| cm.setParameter(wxCouponMerchantDto.getParameter()); | cm.setParameter(wxCouponMerchantDto.getParameter()); | ||||
| cm.setProductId(record.getId()); | cm.setProductId(record.getId()); | ||||
| @@ -508,12 +509,14 @@ public class WxCouponServiceImpl implements WxCouponService { | |||||
| } | } | ||||
| if (merchantParamList != null && merchantParamList.size() > 0) { | if (merchantParamList != null && merchantParamList.size() > 0) { | ||||
| WxCouponMerchant cmParam = new WxCouponMerchant(); | WxCouponMerchant cmParam = new WxCouponMerchant(); | ||||
| cmParam.updateTenantInfo(record); | |||||
| cmParam.setProductId(record.getId()); | cmParam.setProductId(record.getId()); | ||||
| List<WxCouponMerchant> oldList = wxCouponMerchantMapper.findList(cmParam); | List<WxCouponMerchant> oldList = wxCouponMerchantMapper.findList(cmParam); | ||||
| List<WxCouponMerchantDto> wxCouponMerchantDtoList = new ArrayList<>(); | List<WxCouponMerchantDto> wxCouponMerchantDtoList = new ArrayList<>(); | ||||
| merchantParamList.stream().forEach(merchantParam -> { | merchantParamList.stream().forEach(merchantParam -> { | ||||
| WxCouponMerchant cm = new WxCouponMerchant(); | WxCouponMerchant cm = new WxCouponMerchant(); | ||||
| WxCouponMerchantDto wxCouponMerchantDto = parseMerchantParam(merchantParam); | WxCouponMerchantDto wxCouponMerchantDto = parseMerchantParam(merchantParam); | ||||
| cm.updateTenantInfo(record); | |||||
| cm.setMerchantId(wxCouponMerchantDto.getMerchantId()); | cm.setMerchantId(wxCouponMerchantDto.getMerchantId()); | ||||
| cm.setProductId(record.getId()); | cm.setProductId(record.getId()); | ||||
| WxCouponMerchant rcm = wxCouponMerchantMapper.selectOne(new QueryWrapper<>(cm)); | WxCouponMerchant rcm = wxCouponMerchantMapper.selectOne(new QueryWrapper<>(cm)); | ||||
| @@ -1613,6 +1613,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| */ | */ | ||||
| private void setMerchantId(WxCoupon coupon, WxCreditHistory creditHistory) { | private void setMerchantId(WxCoupon coupon, WxCreditHistory creditHistory) { | ||||
| WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); | WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); | ||||
| wxCouponMerchant.updateTenantInfo(coupon); | |||||
| wxCouponMerchant.setProductId(coupon.getId()); | wxCouponMerchant.setProductId(coupon.getId()); | ||||
| wxCouponMerchant.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); | wxCouponMerchant.setStatus(EnumCouponMerchantStatus.COUPON_MERCHANT_STATUS_VALID.getCode()); | ||||
| List<WxCouponMerchant> list = wxCouponMerchantMapper.findList(wxCouponMerchant); | List<WxCouponMerchant> list = wxCouponMerchantMapper.findList(wxCouponMerchant); | ||||
| @@ -95,6 +95,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { | |||||
| //如券包就没有商户 | //如券包就没有商户 | ||||
| if (EnumCouponType.mustHasMerchant(wxCoupon.getType())) { | if (EnumCouponType.mustHasMerchant(wxCoupon.getType())) { | ||||
| WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); | WxCouponMerchant wxCouponMerchant = new WxCouponMerchant(); | ||||
| wxCouponMerchant.updateTenantInfo(wxCoupon); | |||||
| 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); | ||||