| @@ -11,6 +11,7 @@ import com.iformall.controller.base.BaseController; | |||||
| import com.iformall.domain.dto.WxCouponChannelDto; | import com.iformall.domain.dto.WxCouponChannelDto; | ||||
| import com.iformall.domain.po.*; | import com.iformall.domain.po.*; | ||||
| import com.iformall.domain.vo.WxCouponChannelVo; | import com.iformall.domain.vo.WxCouponChannelVo; | ||||
| import com.iformall.enums.EnumCouponChannelStatus; | |||||
| import com.iformall.enums.EnumCouponSourceType; | import com.iformall.enums.EnumCouponSourceType; | ||||
| import com.iformall.domain.po.base.BaseEntity; | import com.iformall.domain.po.base.BaseEntity; | ||||
| import com.iformall.enums.EnumCouponStatus; | import com.iformall.enums.EnumCouponStatus; | ||||
| @@ -161,7 +162,7 @@ public class WxCouponChannelController extends BaseController { | |||||
| List<Integer> channellist = new ArrayList<>(); | List<Integer> channellist = new ArrayList<>(); | ||||
| WxCouponChannel wxCouponChannel = new WxCouponChannel(); | WxCouponChannel wxCouponChannel = new WxCouponChannel(); | ||||
| wxCouponChannel.updateTenantInfo(getTenantInfo()); | wxCouponChannel.updateTenantInfo(getTenantInfo()); | ||||
| wxCouponChannel.setStatus(0); | |||||
| wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); | |||||
| wxCouponChannel.setCouponId(id); | wxCouponChannel.setCouponId(id); | ||||
| List<WxCouponChannel> list = wxCouponChannelService.listAsPage(wxCouponChannel, 1, 5).getList(); | List<WxCouponChannel> list = wxCouponChannelService.listAsPage(wxCouponChannel, 1, 5).getList(); | ||||
| if (list.isEmpty()) { | if (list.isEmpty()) { | ||||
| @@ -10,6 +10,7 @@ import com.iformall.domain.po.WxCoupon; | |||||
| import com.iformall.domain.po.WxCouponChannel; | import com.iformall.domain.po.WxCouponChannel; | ||||
| import com.iformall.domain.po.base.BaseEntity; | import com.iformall.domain.po.base.BaseEntity; | ||||
| import com.iformall.domain.vo.WxCouponChannelVo; | import com.iformall.domain.vo.WxCouponChannelVo; | ||||
| import com.iformall.enums.EnumCouponChannelStatus; | |||||
| import com.iformall.enums.EnumCouponStatus; | import com.iformall.enums.EnumCouponStatus; | ||||
| import com.iformall.service.WxCouponChannelService; | import com.iformall.service.WxCouponChannelService; | ||||
| import com.iformall.service.WxCouponService; | import com.iformall.service.WxCouponService; | ||||
| @@ -122,7 +123,7 @@ public class WxCouponChannelController extends BaseController { | |||||
| List<Integer> channellist = new ArrayList<>(); | List<Integer> channellist = new ArrayList<>(); | ||||
| WxCouponChannel wxCouponChannel = new WxCouponChannel(); | WxCouponChannel wxCouponChannel = new WxCouponChannel(); | ||||
| wxCouponChannel.updateTenantInfo(getTenantInfo()); | wxCouponChannel.updateTenantInfo(getTenantInfo()); | ||||
| wxCouponChannel.setStatus(0); | |||||
| wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); | |||||
| wxCouponChannel.setCouponId(id); | wxCouponChannel.setCouponId(id); | ||||
| List<WxCouponChannel> list = wxCouponChannelService.listAsPage(wxCouponChannel, 1, 5).getList(); | List<WxCouponChannel> list = wxCouponChannelService.listAsPage(wxCouponChannel, 1, 5).getList(); | ||||
| if (list.isEmpty()) { | if (list.isEmpty()) { | ||||
| @@ -282,6 +282,7 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { | |||||
| wxCouponChannelQuery.updateTenantInfo(coupon); | wxCouponChannelQuery.updateTenantInfo(coupon); | ||||
| wxCouponChannelQuery.setCouponId(coupon.getId()); | wxCouponChannelQuery.setCouponId(coupon.getId()); | ||||
| wxCouponChannelQuery.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_DOUYIN.getCode()); | wxCouponChannelQuery.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_DOUYIN.getCode()); | ||||
| wxCouponChannelQuery.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); | |||||
| List<WxCouponChannel> wxCouponChannels = wxCouponChannelMapper.findList(wxCouponChannelQuery); | List<WxCouponChannel> wxCouponChannels = wxCouponChannelMapper.findList(wxCouponChannelQuery); | ||||
| WxCouponChannel wxCouponChannel = null; | WxCouponChannel wxCouponChannel = null; | ||||
| Date now = new Date(); | Date now = new Date(); | ||||
| @@ -2486,6 +2486,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| Long couponId = cardCVo.getCouponId(); | Long couponId = cardCVo.getCouponId(); | ||||
| WxCouponChannel wxCouponChannel = new WxCouponChannel(); | WxCouponChannel wxCouponChannel = new WxCouponChannel(); | ||||
| wxCouponChannel.setCouponId(couponId); | wxCouponChannel.setCouponId(couponId); | ||||
| wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); | |||||
| List<WxCouponChannel> list = wxCouponChannelMapper.findList(wxCouponChannel); | List<WxCouponChannel> list = wxCouponChannelMapper.findList(wxCouponChannel); | ||||
| if (!list.isEmpty()) { | if (!list.isEmpty()) { | ||||
| cardCVo.setCouponChannelId(list.get(0).getId()); | cardCVo.setCouponChannelId(list.get(0).getId()); | ||||
| @@ -11,6 +11,7 @@ import com.iformall.common.ResultData; | |||||
| import com.iformall.domain.po.*; | import com.iformall.domain.po.*; | ||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| import com.iformall.domain.vo.WxCouponCVo; | import com.iformall.domain.vo.WxCouponCVo; | ||||
| import com.iformall.enums.EnumCouponChannelStatus; | |||||
| import com.iformall.enums.EnumCouponChannelType; | import com.iformall.enums.EnumCouponChannelType; | ||||
| import com.iformall.enums.EnumScreenAdType; | import com.iformall.enums.EnumScreenAdType; | ||||
| import com.iformall.mapper.WxCampaignMapper; | import com.iformall.mapper.WxCampaignMapper; | ||||
| @@ -144,7 +145,7 @@ public class WxScreenAdServiceImpl implements WxScreenAdService { | |||||
| WxCouponChannel wxCouponChannel = new WxCouponChannel(); | WxCouponChannel wxCouponChannel = new WxCouponChannel(); | ||||
| wxCouponChannel.updateTenantInfo(tenantEntity); | wxCouponChannel.updateTenantInfo(tenantEntity); | ||||
| wxCouponChannel.setCouponId(couponId); | wxCouponChannel.setCouponId(couponId); | ||||
| wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); | |||||
| List<WxCouponChannel> list = wxCouponChannelService.findList(wxCouponChannel); | List<WxCouponChannel> list = wxCouponChannelService.findList(wxCouponChannel); | ||||
| list.stream().forEach(cc->{ | list.stream().forEach(cc->{ | ||||
| @@ -39,9 +39,6 @@ | |||||
| <if test="null != status "> | <if test="null != status "> | ||||
| and cc.status = #{status} | and cc.status = #{status} | ||||
| </if> | </if> | ||||
| <if test="null == status "> | |||||
| and cc.status = 0 | |||||
| </if> | |||||
| <if test=" null != id "> | <if test=" null != id "> | ||||
| and cc.`id` = #{id} | and cc.`id` = #{id} | ||||