From 274a82108dd64dbe131dee7d4bd6263598d26bbc Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 18 Jan 2022 13:41:17 +0800 Subject: [PATCH] =?UTF-8?q?/=E3=80=81..?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxCouponChannelController.java | 7 +++++++ .../src/main/resources/mapper/WxCouponChannelMapper.xml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index a8bbb0fef..6f6c710fe 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -71,6 +71,13 @@ public class WxCouponChannelController extends BaseController { } wxCouponChannel.setShowBeginTime(new Date()); + if(EnumCouponChannelType.COUPON_CHANNEL_ID_CARD.equals(wxCouponChannel.getTargetAd()) + || EnumCouponChannelType.COUPON_CHANNEL_ID_CREDIT.equals(wxCouponChannel.getTargetAd())){ + PageInfo page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize); + filterTimed(wxCouponChannel, page); + return new ResultData(page); + } + String key = EnumCacheKey.C_INDEX_PAGE_LIST.getMessage() + wxCouponChannel.getTenantId() + "_" + wxCouponChannel.getTargetAd() + "_" diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index 1828c3e55..c69c11dbf 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -511,6 +511,6 @@ #{targetAdsItem} - order by ${sortColumns} +