From 6a54306f0d072396b94d7bc39992106b6f292331 Mon Sep 17 00:00:00 2001 From: zhengfangyuan Date: Sun, 1 Jan 2023 13:25:46 +0800 Subject: [PATCH] fix bug --- .../iformall/controller/market/WxCouponChannelController.java | 3 ++- .../com/iformall/controller/WxCouponChannelController.java | 3 ++- .../com/iformall/service/impl/TtCouponGoodsServiceImpl.java | 1 + .../com/iformall/service/impl/WxCouponOrderServiceImpl.java | 1 + .../java/com/iformall/service/impl/WxScreenAdServiceImpl.java | 3 ++- .../src/main/resources/mapper/WxCouponChannelMapper.xml | 3 --- 6 files changed, 8 insertions(+), 6 deletions(-) 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 ad7cada00..f9d3010b5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java @@ -11,6 +11,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.dto.WxCouponChannelDto; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxCouponChannelVo; +import com.iformall.enums.EnumCouponChannelStatus; import com.iformall.enums.EnumCouponSourceType; import com.iformall.domain.po.base.BaseEntity; import com.iformall.enums.EnumCouponStatus; @@ -161,7 +162,7 @@ public class WxCouponChannelController extends BaseController { List channellist = new ArrayList<>(); WxCouponChannel wxCouponChannel = new WxCouponChannel(); wxCouponChannel.updateTenantInfo(getTenantInfo()); - wxCouponChannel.setStatus(0); + wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setCouponId(id); List list = wxCouponChannelService.listAsPage(wxCouponChannel, 1, 5).getList(); if (list.isEmpty()) { diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index d5d2384cf..023e2caa4 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -10,6 +10,7 @@ import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.vo.WxCouponChannelVo; +import com.iformall.enums.EnumCouponChannelStatus; import com.iformall.enums.EnumCouponStatus; import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxCouponService; @@ -122,7 +123,7 @@ public class WxCouponChannelController extends BaseController { List channellist = new ArrayList<>(); WxCouponChannel wxCouponChannel = new WxCouponChannel(); wxCouponChannel.updateTenantInfo(getTenantInfo()); - wxCouponChannel.setStatus(0); + wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setCouponId(id); List list = wxCouponChannelService.listAsPage(wxCouponChannel, 1, 5).getList(); if (list.isEmpty()) { 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 9fab830a6..26ed1acad 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java @@ -282,6 +282,7 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { wxCouponChannelQuery.updateTenantInfo(coupon); wxCouponChannelQuery.setCouponId(coupon.getId()); 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(); 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 627699d8b..d7aa69b3b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -2486,6 +2486,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { Long couponId = cardCVo.getCouponId(); WxCouponChannel wxCouponChannel = new WxCouponChannel(); wxCouponChannel.setCouponId(couponId); + wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); List list = wxCouponChannelMapper.findList(wxCouponChannel); if (!list.isEmpty()) { cardCVo.setCouponChannelId(list.get(0).getId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java index c3fee56bc..4e978e2f0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java @@ -11,6 +11,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxCouponCVo; +import com.iformall.enums.EnumCouponChannelStatus; import com.iformall.enums.EnumCouponChannelType; import com.iformall.enums.EnumScreenAdType; import com.iformall.mapper.WxCampaignMapper; @@ -144,7 +145,7 @@ public class WxScreenAdServiceImpl implements WxScreenAdService { WxCouponChannel wxCouponChannel = new WxCouponChannel(); wxCouponChannel.updateTenantInfo(tenantEntity); wxCouponChannel.setCouponId(couponId); - + wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); List list = wxCouponChannelService.findList(wxCouponChannel); list.stream().forEach(cc->{ diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index 19e885475..2dbf4dd37 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -39,9 +39,6 @@ and cc.status = #{status} - - and cc.status = 0 - and cc.`id` = #{id}