From 83b8d3f4a4704bf5883be65ce433c073842cf3ae Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 2 Aug 2023 10:49:05 +0800 Subject: [PATCH] //..coupon_bug --- .../iformall/controller/market/TtCouponGoodsController.java | 3 +++ .../java/com/iformall/service/impl/WxCouponServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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 2339011d9..4c9a8fd00 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/TtCouponGoodsController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/TtCouponGoodsController.java @@ -141,6 +141,9 @@ public class TtCouponGoodsController extends DouyinBaseController { if(coupon == null){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } + if(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode().equals(coupon.getStatus())){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该券已被作废"); + } if(coupon.getSalePrice() == null || coupon.getSalePrice().intValue() == 0){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"免费券无需提审"); } 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 9c5d99f6c..60a18cb9d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -1840,7 +1840,7 @@ public class WxCouponServiceImpl implements WxCouponService { } Long draftId = wxCouponMapper.selectDraftId(couponId,tenantInfo.getTenantId()); if(draftId != null){ - TtCouponChannelPoi draftStatus = ttCouponChannelPoiMapper.selectById(tenantInfo.getTenantId(), couponId); + TtCouponChannelPoi draftStatus = ttCouponChannelPoiMapper.selectById(tenantInfo.getTenantId(), draftId); if(draftStatus != null && EnumSpuSyncStatus.sync_auditing.getCode().equals(draftStatus.getStatus())){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"此券草稿审核中"); }