From 0ad137218b960c6f48a2348e39cc8eaf9f03aeaf Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 24 Jul 2023 22:22:56 +0800 Subject: [PATCH] //..coupon_ --- .../market/TtCouponGoodsController.java | 1 + .../market/WxCouponChannelController.java | 32 +-- .../controller/market/WxCouponController.java | 57 +++++ .../controller/callback/TtWebController.java | 42 ++-- .../domain/po/TtCouponChannelPoi.java | 3 +- .../mapper/TtCouponChannelPoiMapper.java | 2 + .../com/iformall/mapper/WxCouponMapper.java | 2 + .../mapper/WxCouponMerchantMapper.java | 2 + .../service/TtCouponGoodsService.java | 2 + .../impl/TtCouponGoodsServiceImpl.java | 237 +++++++++++++----- .../impl/WxCouponChannelServiceImpl.java | 52 ++-- .../service/impl/WxCouponMallServiceImpl.java | 4 +- .../service/impl/WxCouponServiceImpl.java | 12 +- .../mapper/TtCouponChannelPoiMapper.xml | 7 + .../main/resources/mapper/WxCouponMapper.xml | 9 + .../mapper/WxCouponMerchantMapper.xml | 6 +- 16 files changed, 331 insertions(+), 139 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/TtCouponGoodsController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/TtCouponGoodsController.java index 22b73da31..778334f59 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/TtCouponGoodsController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/TtCouponGoodsController.java @@ -153,6 +153,7 @@ public class TtCouponGoodsController extends DouyinBaseController { } } + @TenantIgnore @ApiOperation("实时查询审核状态") @GetMapping("product/draft") @SystemControllerLog(description = "实时查询审核状态") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java index c72bf14ab..598ec006b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java @@ -107,22 +107,22 @@ public class WxCouponChannelController extends BaseController { return resultData; } - @ApiOperation("预审核上架") - @PostMapping("updateOnline") - @SystemControllerLog(description = "预审核上架") - public ResultData updateOnline(@RequestBody WxCouponChannel wxCouponChannel) { - wxCouponChannel.updateTenantInfo(getTenantInfo()); - if (wxCouponChannel.getId() == null) { - return new ResultData(ResultData.ERROR, "缺少id"); - } - ResultData resultData = wxCouponChannelService.updateOnline(wxCouponChannel); - if(resultData.code == 200){ - CouponCacheUtils.removeCouponChannelCache(redisTemplate, wxCouponChannel.getId()); - CouponCacheUtils.removeDouyinLivePageCache(redisTemplate, wxCouponChannel.getTenantId(), null, null); - } - - return resultData; - } +// @ApiOperation("预审核上架") +// @PostMapping("updateOnline") +// @SystemControllerLog(description = "预审核上架") +// public ResultData updateOnline(@RequestBody WxCouponChannel wxCouponChannel) { +// wxCouponChannel.updateTenantInfo(getTenantInfo()); +// if (wxCouponChannel.getId() == null) { +// return new ResultData(ResultData.ERROR, "缺少id"); +// } +// ResultData resultData = wxCouponChannelService.updateOnline(wxCouponChannel); +// if(resultData.code == 200){ +// CouponCacheUtils.removeCouponChannelCache(redisTemplate, wxCouponChannel.getId()); +// CouponCacheUtils.removeDouyinLivePageCache(redisTemplate, wxCouponChannel.getTenantId(), null, null); +// } +// +// return resultData; +// } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 753d307df..c0626f016 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -250,6 +250,63 @@ public class WxCouponController extends BaseController { return result; } + @TenantIgnore + @ApiOperation("根据id更新接口") + @PostMapping("updateOnlie") + @SystemControllerLog(description = "券投放-更新") + public ResultData updateOnlie(@RequestBody WxCoupon wxCoupon) { + logger.debug("[" + getIpAddr() + "] WxCouponController::update"); + if (wxCoupon.getId() == null) { + return new ResultData(ResultData.ERROR, "缺少id"); + } + wxCoupon.updateTenantInfo(getTenantInfo()); + WxCoupon coupon = wxCouponService.getById(wxCoupon.getId(),wxCoupon.getTenantId()); + if (null == coupon) { + return new ResultData(ResultData.ERROR, "券未查询到。"+wxCoupon.getId()); + } + + + if(EnumDelFlag.YES.getCode().equals(wxCoupon.getIsDel())){ + if(!EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode().equals(coupon.getStatus())){ + return new ResultData(ResultData.ERROR, "请先作废,再进行删除。"); + } + wxCouponService.deleteById(wxCoupon.getId(),wxCoupon.getTenantId()); + CouponCacheUtils.removeCouponCache(redisTemplate, wxCoupon.getId()); + CouponCacheUtils.removeCouponMerchantCache(redisTemplate, wxCoupon.getId(),null); + CouponCacheUtils.removeOnlyCouponCache(redisTemplate, wxCoupon.getId()); + return new ResultData(); + } + + //启动审批流 + if (wxCoupon.getFlowParams() != null && wxCoupon.getFlowParams().size() > 0) { + logger.info("------coupon.update().businessType:"+wxCoupon.getFlowParams().get("businessType")); + wxCoupon.getFlowParams().put("businessId",wxCoupon.getId()); + wxFlowService.start(wxCoupon.getFlowParams(), getUserId(), getUser().getName(), getTenantInfo()); + //作废审批 + if (EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode().equals(wxCoupon.getStatus())) { + wxCoupon.setCancleApplyStatus(EnumRentContractAppStatus.APPLYING.getCode()); + return new ResultData(wxCoupon); + } else { + //投放审批 + wxCoupon.setPutApplyStatus(EnumRentContractAppStatus.APPLYING.getCode()); + } + } + + ResultData result = null; + if(EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode().equals(wxCoupon.getStatus())){ + result = wxCouponService.disable(wxCoupon, wxCoupon.getId(),getUser()); + }else{ + result = wxCouponService.saveOrUpdate(wxCoupon, null); + if(wxCoupon.getRemainInventory() != null){ + redisLock.setCouponStock(wxCoupon.getId(), wxCoupon.getRemainInventory()); + } + } + + CouponCacheUtils.removeCouponCache(redisTemplate, wxCoupon.getId()); + CouponCacheUtils.removeCouponMerchantCache(redisTemplate, wxCoupon.getId(),null); + return result; + } + @ApiOperation("根据id更新接口") @PostMapping("continueAdd") @SystemControllerLog(description = "继续添加") diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/TtWebController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/TtWebController.java index 01d51661b..a77fa6cb2 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/TtWebController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/TtWebController.java @@ -107,26 +107,30 @@ public class TtWebController extends BaseController { // String product_id = content.get("product_id").toString(); // String reason = (String) content.get("reason"); // String status = (String) content.get("status"); + TtCouponChannelPoi couponChannelPoi = ttCouponGoodsService.getCouponChannelBySpuId(product_id); + +// TtCouponChannelPoi couponChannelPoi = new TtCouponChannelPoi(); +//// couponChannelPoi.updateTenantInfo(appInfo); +// couponChannelPoi.setSpuId(product_id); +// if("FAIL".equals(status)){ +// couponChannelPoi.setStatus(EnumSpuSyncStatus.sync_audit_rejection.getCode()); +// couponChannelPoi.setStatusDesc(reason); +// +// }else if("PASS".equals(status)){ +//// couponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_audit_pass.getCode()); +// //抖音审核通过既上架 +// couponChannelPoi.setStatus(EnumSpuSyncStatus.sync_put_on.getCode()); +// couponChannelPoi.setStatusDesc(reason); +// +// }else{ +// resultMap.put("err_code",1000); +// resultMap.put("err_tips","error"); +// return resultMap; +// } +// ttCouponGoodsService.handlerTtGoodsAudit(couponChannelPoi); + + ttCouponGoodsService.productDraftGet(couponChannelPoi,couponChannelPoi.getId(),false); - TtCouponChannelPoi couponChannelPoi = new TtCouponChannelPoi(); -// couponChannelPoi.updateTenantInfo(appInfo); - couponChannelPoi.setSpuId(product_id); - if("FAIL".equals(status)){ - couponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_audit_rejection.getCode()); - couponChannelPoi.setLastStatusDesc(reason); - - }else if("PASS".equals(status)){ -// couponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_audit_pass.getCode()); - //抖音审核通过既上架 - couponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_put_on.getCode()); - couponChannelPoi.setLastStatusDesc(reason); - - }else{ - resultMap.put("err_code",1000); - resultMap.put("err_tips","error"); - return resultMap; - } - ttCouponGoodsService.handlerTtGoodsAudit(couponChannelPoi); resultMap.put("err_code",0); resultMap.put("err_tips","success"); openRedisTemplate.opsForValue().set(key,"1",16*60, TimeUnit.SECONDS); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/TtCouponChannelPoi.java b/mallinkService/src/main/java/com/iformall/domain/po/TtCouponChannelPoi.java index cfd78b340..eb6bc497e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/TtCouponChannelPoi.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/TtCouponChannelPoi.java @@ -25,8 +25,7 @@ public class TtCouponChannelPoi extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="spuId",name="spuId") private String spuId; - //该字段状态更新不及时,不作为业务使用 - @io.swagger.annotations.ApiModelProperty(value="状态:0-审核中,1-上架,2-下架,3-审核拒绝 4-审核通过",name="status") + @io.swagger.annotations.ApiModelProperty(value=" EnumSpuSyncStatus 状态:0-审核中,1-上架,2-下架,3-审核拒绝 4-审核通过",name="status") private Integer status; @io.swagger.annotations.ApiModelProperty(value="描述",name="statusDesc") diff --git a/mallinkService/src/main/java/com/iformall/mapper/TtCouponChannelPoiMapper.java b/mallinkService/src/main/java/com/iformall/mapper/TtCouponChannelPoiMapper.java index fa42ca6ba..1d803d12e 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/TtCouponChannelPoiMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/TtCouponChannelPoiMapper.java @@ -18,4 +18,6 @@ public interface TtCouponChannelPoiMapper extends CommonMapper { Integer findCategoryIdById(@Param("id")Long id,@Param("tenantId")String tenantId); + WxCoupon selectDraftCoupon(@Param("couponId")Long id,@Param("tenantId")String tenantId); + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java index db5b704e3..84922262f 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMerchantMapper.java @@ -30,4 +30,6 @@ public interface WxCouponMerchantMapper extends CommonMapper addList); + + void delteAllByProductId(WxCouponMerchant couponMerchant); } diff --git a/mallinkService/src/main/java/com/iformall/service/TtCouponGoodsService.java b/mallinkService/src/main/java/com/iformall/service/TtCouponGoodsService.java index f7ab2dfcb..0382d1330 100644 --- a/mallinkService/src/main/java/com/iformall/service/TtCouponGoodsService.java +++ b/mallinkService/src/main/java/com/iformall/service/TtCouponGoodsService.java @@ -16,6 +16,8 @@ public interface TtCouponGoodsService { ResultData productSave(WxCoupon coupon,boolean isSaas) throws Exception; + TtCouponChannelPoi getCouponChannelBySpuId(String spuId); + int handlerTtGoodsAudit(TtCouponChannelPoi couponChannelPoi); ResultData productDraftGet(TenantEntity tenantEntity,Long id,boolean isSaas); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java index 5bcaca427..01f0307f7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java @@ -22,6 +22,7 @@ import com.iformall.service.pay.service.fee.ServiceFeeAdapterService; import com.iformall.utils.Constant; import com.iformall.utils.DateUtils; import me.chanjar.weixin.common.error.WxErrorException; +import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,6 +41,9 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired + WxMallService wxMallService; + @Autowired WxCouponMapper wxCouponMapper; @@ -83,6 +87,9 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { @Autowired WxCouponMallService wxCouponMallService; + @Autowired + WxCouponMallMapper wxCouponMallMapper; + @Lazy @Autowired WxMerchantService wxMerchantService; @@ -161,11 +168,22 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { @Transactional(isolation=Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) public ResultData productSave(WxCoupon coupon,boolean isSaas) throws Exception { TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(coupon.getTenantId(),coupon.getId()); - if(ttCouponChannelPoi != null && - (EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus()) - || EnumSpuSyncStatus.sync_put_on.getCode().equals(ttCouponChannelPoi.getLastStatus()) - || EnumSpuSyncStatus.sync_audit_disable.getCode().equals(ttCouponChannelPoi.getLastStatus()))){ - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"该券状态不允许提交审核"); + if(EnumCouponVersion.online.getCode().equals(coupon.getVersion())){ + if(ttCouponChannelPoi != null && + (EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getStatus()) + || EnumSpuSyncStatus.sync_put_on.getCode().equals(ttCouponChannelPoi.getStatus()) + || EnumSpuSyncStatus.sync_pull_off.getCode().equals(ttCouponChannelPoi.getStatus()) + || EnumSpuSyncStatus.sync_audit_pass.getCode().equals(ttCouponChannelPoi.getStatus())) + ){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"该券状态不允许提交审核"); + } + }else{ + if(ttCouponChannelPoi != null && EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getStatus())){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"该券状态审核中"); + } + } + if(ttCouponChannelPoi != null && EnumSpuSyncStatus.sync_audit_disable.getCode().equals(ttCouponChannelPoi.getStatus())){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"该券已被封禁"); } WxCoupon ttattrs = wxCouponService.getAttrsById(coupon.getId(), coupon.getTenantId()); @@ -248,9 +266,9 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { if(pois == null || pois.isEmpty()){ return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND.getCode(),"未找到poi门店"); } - if(pois.size() != merchantIds.size()){ - return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND.getCode(),"存在未匹配poi的门店"); - } +// if(pois.size() != merchantIds.size()){ +// return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND.getCode(),"存在未匹配poi的门店"); +// } List poiList = new ArrayList(); for (TtMerchantPoi poi: pois) { Product.PoiStruct poiStruct = new Product.PoiStruct(); @@ -262,30 +280,31 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { poiList.add(poiStruct); } - WxMerchant payAccountMerchant = null; - if (EnumCouponType.isParentCoupon(coupon.getType())) { - if (EnumCouponType.COUPON_DOUYIN_PLAT.getCode() == coupon.getType()) { - payAccountMerchant = wxMerchantService.findAdmin(coupon); - }else if (EnumCouponType.COUPON_DOUYIN_BRAND.getCode() == coupon.getType()) { - payAccountMerchant = wxMerchantService.findBrandAdmin(coupon, coupon.getBrand()); - }else { - return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND.getCode(),"当前券类型未找到收款商户"); - } + WxMall mall = wxMallService.getByTenantId(coupon.getTenantId()); - }else { - WxMerchant merchantQ = new WxMerchant(); - merchantQ.updateTenantInfo(coupon); - merchantQ.setIds(merchantIds); - merchantQ.setSortColumns(BaseEntity.SortField.MerchantAdmin); - payAccountMerchant = wxMerchantMapper.findIdNameList(merchantQ).get(0); - } +// WxMerchant payAccountMerchant = null; +// if (EnumCouponType.isParentCoupon(coupon.getType())) { +// if (EnumCouponType.COUPON_DOUYIN_PLAT.getCode() == coupon.getType()) { +// payAccountMerchant = wxMerchantService.findAdmin(coupon); +// }else if (EnumCouponType.COUPON_DOUYIN_BRAND.getCode() == coupon.getType()) { +// payAccountMerchant = wxMerchantService.findBrandAdmin(coupon, coupon.getBrand()); +// }else { +// return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND.getCode(),"当前券类型未找到收款商户"); +// } +// +// }else { +// WxMerchant merchantQ = new WxMerchant(); +// merchantQ.updateTenantInfo(coupon); +// merchantQ.setIds(merchantIds); +// merchantQ.setSortColumns(BaseEntity.SortField.MerchantAdmin); +// payAccountMerchant = wxMerchantMapper.findIdNameList(merchantQ).get(0); +// } //投放到抖音渠道,获取详情地址,以做审核 WxCouponChannel wxCouponChannelQuery = new WxCouponChannel(); wxCouponChannelQuery.updateTenantInfo(coupon); - wxCouponChannelQuery.setCouponId(coupon.getId()); + wxCouponChannelQuery.setCouponId(coupon.getCouponId()); wxCouponChannelQuery.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_DOUYIN.getCode()); - wxCouponChannelQuery.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); List wxCouponChannels = wxCouponChannelMapper.findList(wxCouponChannelQuery); WxCouponChannel wxCouponChannel = null; Date now = new Date(); @@ -317,7 +336,7 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { wxCouponChannel.setTitle(coupon.getTitle()); wxCouponChannelMapper.insert(wxCouponChannel); - }else if(wxCouponChannels.size() == 1){ + }else if(wxCouponChannels.size() >= 1){ wxCouponChannel = wxCouponChannels.get(0); wxCouponChannel.setShowBeginTime(showBeginTime); wxCouponChannel.setBeginTime(beginTime); @@ -347,7 +366,7 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { prostruct.setCategoryId(ttattrs.getCategoryId()); prostruct.setProductType(ttattrs.getProductType()); prostruct.setBizLine(5);//默认小程序 - prostruct.setAccountName(payAccountMerchant.getName()); + prostruct.setAccountName(mall.getName()); prostruct.setSoldStartTime((long) DateUtils.getSecondTimestamp(wxCouponChannel.getBeginTime())); prostruct.setSoldEndTime((long) DateUtils.getSecondTimestamp(wxCouponChannel.getEndTime())); @@ -426,12 +445,19 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { } + @Override + public TtCouponChannelPoi getCouponChannelBySpuId(String spuId) { + return ttCouponChannelPoiMapper.selectBySpuId(spuId); + } + + @Override public int handlerTtGoodsAudit(TtCouponChannelPoi couponChannelPoi) { return ttCouponChannelPoiMapper.updateBySpuId(couponChannelPoi); } @Override + @Transactional(isolation=Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) public ResultData productDraftGet(TenantEntity tenantEntity,Long id,boolean isSaas) { TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(tenantEntity.getTenantId(),id); if(ttCouponChannelPoi == null){ @@ -440,26 +466,106 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { try { List products = null; if (isSaas) { - products = ttMerchantPoiService.getTtGoodLifeSassService(ttCouponChannelPoi).getGoodsService().productDraftGet(getDouyinLaikeId(tenantEntity),null, ttCouponChannelPoi.getId().toString()); + products = ttMerchantPoiService.getTtGoodLifeSassService(tenantEntity).getGoodsService().productDraftGet(getDouyinLaikeId(tenantEntity),null, id.toString()); }else { - products = ttMerchantPoiService.getTtWebService(ttCouponChannelPoi).getGoodsService().productDraftGet(null, ttCouponChannelPoi.getId().toString()); + products = ttMerchantPoiService.getTtWebService(tenantEntity).getGoodsService().productDraftGet(null, id.toString()); } if(null != products && products.size() > 0){ Product product = products.get(0); - if(product.getDraftStatus().intValue() == 12 && !EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getLastStatus())){ - ttCouponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_audit_rejection.getCode()); - ttCouponChannelPoi.setLastStatusDesc(product.getAuditMsg()); - ttCouponChannelPoi.setUpdateDate(new Date()); - ttCouponChannelPoiMapper.updateById(ttCouponChannelPoi); + //判断是否存在草稿数据 + WxCoupon draftCoupon = wxCouponMapper.selectDraftCoupon(id,tenantEntity.getTenantId()); + if(draftCoupon == null){ + if(product.getDraftStatus().intValue() == 12 && !EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getStatus())){ + ttCouponChannelPoi.setStatus(EnumSpuSyncStatus.sync_audit_rejection.getCode()); + ttCouponChannelPoi.setStatusDesc(product.getAuditMsg()); + ttCouponChannelPoi.setUpdateDate(new Date()); + ttCouponChannelPoiMapper.updateById(ttCouponChannelPoi); + }else if(product.getDraftStatus().intValue() == 1 && !EnumSpuSyncStatus.sync_audit_pass.getCode().equals(ttCouponChannelPoi.getStatus())){ + //审核通过即上线 + ttCouponChannelPoi.setStatus(EnumSpuSyncStatus.sync_put_on.getCode()); + ttCouponChannelPoi.setStatusDesc(""); + ttCouponChannelPoi.setUpdateDate(new Date()); + ttCouponChannelPoiMapper.updateById(ttCouponChannelPoi); + + WxCouponChannel couponChannel = new WxCouponChannel(); + couponChannel.setId(ttCouponChannelPoi.getCouponChannelId()); + couponChannel.updateTenantInfo(ttCouponChannelPoi); + couponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); + couponChannel.setUpdateDate(new Date()); + wxCouponChannelMapper.updateById(couponChannel); + } + + }else{ + TtCouponChannelPoi ttDraftCouponChannelPoi = ttCouponChannelPoiMapper.selectById(tenantEntity.getTenantId(),draftCoupon.getId()); + if(ttDraftCouponChannelPoi == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"草稿数据异常"); + } + if(product.getDraftStatus().intValue() == 12 && !EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttDraftCouponChannelPoi.getStatus())){ + ttDraftCouponChannelPoi.setStatus(EnumSpuSyncStatus.sync_audit_rejection.getCode()); + ttDraftCouponChannelPoi.setStatusDesc(product.getAuditMsg()); + ttDraftCouponChannelPoi.setUpdateDate(new Date()); + ttCouponChannelPoiMapper.updateById(ttDraftCouponChannelPoi); + }else if(product.getDraftStatus().intValue() == 1 && !EnumSpuSyncStatus.sync_audit_pass.getCode().equals(ttDraftCouponChannelPoi.getStatus())){ + //审核通过即上线,商品数据同步 + WxCoupon wxCoupon = new WxCoupon(); + BeanUtils.copyProperties(wxCoupon,draftCoupon); + wxCoupon.setId(draftCoupon.getCouponId()); + wxCoupon.setVersion(null); + wxCoupon.setRemainInventory(null); + wxCoupon.setInventory(null); + wxCoupon.setUpdateDate(new Date()); + wxCouponMapper.updateById(wxCoupon); + //商场数据同步 + //商户数据同步 + final IdWorker idWorker = IdWorker.get(); + if (EnumCouponType.isParentCoupon(draftCoupon.getType())) { + WxCouponMall couponMall = new WxCouponMall(); + couponMall.updateTenantInfo(draftCoupon); + couponMall.setProductId(draftCoupon.getId()); + List couponMallList = wxCouponMallMapper.findList(couponMall); + couponMall.setProductId(draftCoupon.getCouponId()); + wxCouponMallMapper.delteAllByProductId(couponMall); + + for (WxCouponMall cm : couponMallList) { + cm.setId(idWorker.nextId()); + cm.setProductId(draftCoupon.getCouponId()); + wxCouponMallMapper.insert(cm); + + WxCouponMerchant couponMerchant = new WxCouponMerchant(); + couponMerchant.setTenantId(cm.getMallTenantId()); + couponMerchant.setParentTenantId(cm.getTenantId()); + couponMerchant.setProductId(draftCoupon.getId()); + List couponMerchantList = wxCouponMerchantMapper.findList(couponMerchant); + couponMerchant.setProductId(draftCoupon.getCouponId()); + wxCouponMerchantMapper.delteAllByProductId(couponMerchant); + for (WxCouponMerchant cmt: couponMerchantList) { + cmt.setId(idWorker.nextId()); + cmt.setProductId(draftCoupon.getCouponId()); + wxCouponMerchantMapper.insert(cmt); + } + } + }else{ + WxCouponMerchant couponMerchant = new WxCouponMerchant(); + couponMerchant.updateTenantInfo(draftCoupon); + couponMerchant.setProductId(draftCoupon.getId()); + List couponMerchantList = wxCouponMerchantMapper.findList(couponMerchant); + couponMerchant.setProductId(draftCoupon.getCouponId()); + wxCouponMerchantMapper.delteAllByProductId(couponMerchant); + for (WxCouponMerchant cmt: couponMerchantList) { + cmt.setId(idWorker.nextId()); + cmt.setProductId(draftCoupon.getCouponId()); + wxCouponMerchantMapper.insert(cmt); + } + } + + ttDraftCouponChannelPoi.setStatus(EnumSpuSyncStatus.sync_audit_pass.getCode()); + ttDraftCouponChannelPoi.setStatusDesc(""); + ttDraftCouponChannelPoi.setUpdateDate(new Date()); + ttCouponChannelPoiMapper.updateById(ttDraftCouponChannelPoi); + + } - }else if(product.getDraftStatus().intValue() == 1 && !EnumSpuSyncStatus.sync_audit_pass.getCode().equals(ttCouponChannelPoi.getLastStatus())){ -// ttCouponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_audit_pass.getCode()); - //审核通过 - ttCouponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_put_on.getCode()); - ttCouponChannelPoi.setLastStatusDesc(""); - ttCouponChannelPoi.setUpdateDate(new Date()); - ttCouponChannelPoiMapper.updateById(ttCouponChannelPoi); } return new ResultData(product); @@ -468,9 +574,9 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { } } catch (WxErrorException e) { e.printStackTrace(); - return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),e.getError().getErrorMsg()); + throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(),e.getError().getErrorMsg()); } catch (Exception e) { - return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),e.getMessage()); + throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(),e.getMessage()); } } @@ -492,17 +598,14 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { Product product = products.get(0); if(product.getOnlineStatus().intValue() == 1 && !EnumSpuSyncStatus.sync_put_on.getCode().equals(ttCouponChannelPoi.getStatus())){ ttCouponChannelPoi.setStatus(EnumSpuSyncStatus.sync_put_on.getCode()); - ttCouponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_put_on.getCode()); ttCouponChannelPoi.setUpdateDate(new Date()); ttCouponChannelPoiMapper.updateById(ttCouponChannelPoi); }else if(product.getOnlineStatus().intValue() == 2 && !EnumSpuSyncStatus.sync_pull_off.getCode().equals(ttCouponChannelPoi.getStatus())){ ttCouponChannelPoi.setStatus(EnumSpuSyncStatus.sync_pull_off.getCode()); - ttCouponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_pull_off.getCode()); ttCouponChannelPoi.setUpdateDate(new Date()); ttCouponChannelPoiMapper.updateById(ttCouponChannelPoi); }else if(product.getOnlineStatus().intValue() == 3 && !EnumSpuSyncStatus.sync_audit_disable.getCode().equals(ttCouponChannelPoi.getStatus())){ ttCouponChannelPoi.setStatus(EnumSpuSyncStatus.sync_audit_disable.getCode()); - ttCouponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_audit_disable.getCode()); ttCouponChannelPoi.setUpdateDate(new Date()); ttCouponChannelPoiMapper.updateById(ttCouponChannelPoi); } @@ -525,8 +628,8 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未找到"); } TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(tenantInfo.getTenantId(),id); - if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus()) - || EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getLastStatus())){ + if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getStatus()) + || EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getStatus())){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); } //查询上架 @@ -544,7 +647,7 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { } } - if(op_type.equals(ttCouponChannelPoi.getLastStatus())){ + if(op_type.equals(ttCouponChannelPoi.getStatus())){ logger.info("与线上状态一致, 无需同步{}"+wxCoupon.getId()); return new ResultData(); } @@ -561,7 +664,7 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { TtCouponChannelPoi ccPoi = new TtCouponChannelPoi(); ccPoi.setId(ttCouponChannelPoi.getId()); ccPoi.updateTenantInfo(ttCouponChannelPoi); - ccPoi.setLastStatus(op_type); + ccPoi.setStatus(op_type); ccPoi.setUpdateDate(new Date()); ttCouponChannelPoiMapper.updateById(ccPoi); return new ResultData(); @@ -584,8 +687,8 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未找到"); } TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(tenantInfo.getTenantId(),id); - if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus()) - || EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getLastStatus())){ + if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getStatus()) + || EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getStatus())){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); } try { @@ -616,8 +719,8 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未找到"); } TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(tenantInfo.getTenantId(),id); - if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus()) - || EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getLastStatus())){ + if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getStatus()) + || EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getStatus())){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); } try { @@ -664,8 +767,8 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { if(ttCouponChannelPoi != null){ ttCouponChannelPoi.setCouponChannelId(couponChannelId); ttCouponChannelPoi.setSpuId(productId); -// ttCouponChannelPoi.setStatus(EnumSpuSyncStatus.sync_auditing.getCode()); - ttCouponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_auditing.getCode()); + ttCouponChannelPoi.setStatus(EnumSpuSyncStatus.sync_auditing.getCode()); +// ttCouponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_auditing.getCode()); ttCouponChannelPoi.setLastStatusDesc(""); ttCouponChannelPoi.setUpdateDate(date); ttCouponChannelPoiMapper.updateById(ttCouponChannelPoi); @@ -675,8 +778,8 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { ttCouponChannelPoi.updateTenantInfo(coupon); ttCouponChannelPoi.setCouponChannelId(couponChannelId); ttCouponChannelPoi.setSpuId(productId); -// ttCouponChannelPoi.setStatus(EnumSpuSyncStatus.sync_auditing.getCode()); - ttCouponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_auditing.getCode()); + ttCouponChannelPoi.setStatus(EnumSpuSyncStatus.sync_auditing.getCode()); +// ttCouponChannelPoi.setLastStatus(EnumSpuSyncStatus.sync_auditing.getCode()); ttCouponChannelPoi.setCreateDate(date); ttCouponChannelPoi.setUpdateDate(date); ttCouponChannelPoiMapper.insert(ttCouponChannelPoi); @@ -731,8 +834,8 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { @Override public ResultData poiPlanList(TenantEntity tenantInfo,Long couponId, Integer pageNum, Integer pageSize,boolean isGoodSaas) { TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(tenantInfo.getTenantId(),couponId); - if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus()) - || EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getLastStatus())){ + if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getStatus()) + || EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getStatus())){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); } try { @@ -753,8 +856,8 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { @Override public ResultData poiOrientedPlanList(TenantEntity tenantInfo, Long couponId, Integer pageNum, Integer pageSize, boolean isGoodSaas) { TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(tenantInfo.getTenantId(),couponId); - if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus()) - || EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getLastStatus())){ + if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getStatus()) + || EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getStatus())){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); } try { @@ -782,8 +885,8 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { return new ResultData(ErrorCode.COUPON_ORDER_TYPE_NOT_SUPPORTED); } TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(wxCoupon.getTenantId(),wxCoupon.getId()); - if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus()) - || EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getLastStatus())){ + if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getStatus()) + || EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getStatus())){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); } try { @@ -840,8 +943,8 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { return new ResultData(ErrorCode.COUPON_ORDER_TYPE_NOT_SUPPORTED); } TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(wxCoupon.getTenantId(),wxCoupon.getId()); - if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus()) - || EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getLastStatus())){ + if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getStatus()) + || EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getStatus())){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); } try { 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 6401ab1ca..fbccbab2a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -164,8 +164,8 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { } if(EnumCouponType.getDouYinType().contains(wxCoupon.getType())){ TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(wxCoupon.getTenantId(),wxCoupon.getId()); - if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus()) - || EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getLastStatus())){ + if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getStatus()) + || EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getStatus())){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); } } @@ -906,7 +906,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { } TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(tenantInfo.getTenantId(), couponChannel.getCouponId()); - if(ttCouponChannelPoi != null && ttCouponChannelPoi.getLastStatus() != null && ttCouponChannelPoi.getLastStatus().intValue() > 0){ + if(ttCouponChannelPoi != null && ttCouponChannelPoi.getStatus() != null && ttCouponChannelPoi.getStatus().intValue() > 0){ return new ResultData(ttCouponChannelPoi); } return new ResultData(ErrorCode.SYS_NULLPOINTER_ERROR.getCode(),"未找到可用的数据"); @@ -931,29 +931,29 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { return pageInfo; } - @Override - public ResultData updateOnline(WxCouponChannel wxCouponChannel) { - WxCouponChannel couponChannel = this.getById(wxCouponChannel.getId(), wxCouponChannel.getTenantId()); - if(couponChannel == null){ - return new ResultData(ErrorCode.SYS_NULLPOINTER_ERROR.getCode(),"未找到可用的数据"); - } - TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(couponChannel.getTenantId(), couponChannel.getCouponId()); - - if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus()) - || EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getLastStatus()) - || EnumSpuSyncStatus.sync_audit_disable.getCode().equals(ttCouponChannelPoi.getLastStatus())){ - return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); - } - Date date = new Date(); - WxCouponChannel updChannel = new WxCouponChannel(); - updChannel.setId(wxCouponChannel.getId()); - updChannel.updateTenantInfo(wxCouponChannel); - updChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); - updChannel.setShowBeginTime(date); - updChannel.setUpdateDate(date); - wxCouponChannelMapper.updateById(updChannel); - return new ResultData(); - } +// @Override +// public ResultData updateOnline(WxCouponChannel wxCouponChannel) { +// WxCouponChannel couponChannel = this.getById(wxCouponChannel.getId(), wxCouponChannel.getTenantId()); +// if(couponChannel == null){ +// return new ResultData(ErrorCode.SYS_NULLPOINTER_ERROR.getCode(),"未找到可用的数据"); +// } +// TtCouponChannelPoi ttCouponChannelPoi = ttCouponChannelPoiMapper.selectById(couponChannel.getTenantId(), couponChannel.getCouponId()); +// +// if(ttCouponChannelPoi == null || EnumSpuSyncStatus.sync_auditing.getCode().equals(ttCouponChannelPoi.getLastStatus()) +// || EnumSpuSyncStatus.sync_audit_rejection.getCode().equals(ttCouponChannelPoi.getLastStatus()) +// || EnumSpuSyncStatus.sync_audit_disable.getCode().equals(ttCouponChannelPoi.getLastStatus())){ +// return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券未提交审核或审核未通过"); +// } +// Date date = new Date(); +// WxCouponChannel updChannel = new WxCouponChannel(); +// updChannel.setId(wxCouponChannel.getId()); +// updChannel.updateTenantInfo(wxCouponChannel); +// updChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); +// updChannel.setShowBeginTime(date); +// updChannel.setUpdateDate(date); +// wxCouponChannelMapper.updateById(updChannel); +// return new ResultData(); +// } @Override public Long getCouponOneMerchantId(Long couponChannelId, String tenantId) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponMallServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponMallServiceImpl.java index b30f46510..50e16b9b4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponMallServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponMallServiceImpl.java @@ -40,7 +40,7 @@ public class WxCouponMallServiceImpl implements WxCouponMallService { List list = wxCouponMallMapper.findList(wxCouponMall); if (queryMall) { if (null != list && list.size() > 0 ) { - List mallTenantList = new ArrayList();; + List mallTenantList = new ArrayList(); for (int i = 0 ;i + + update tt_coupon_channel_poi set update_date = now() ,`status` = #{status} diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index c09158f9b..9a791c002 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -65,9 +65,12 @@ + + + @@ -1598,4 +1601,10 @@ and tenant_id = #{tenantId} + + diff --git a/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml index ffb33ac2c..9aa13ea6d 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMerchantMapper.xml @@ -219,5 +219,9 @@ #{item.status,jdbcType=INTEGER}) - + + + delete from wx_coupon_merchant where `product_id` = #{productId} and `tenant_id` = #{tenantId} + +