From 274a82108dd64dbe131dee7d4bd6263598d26bbc Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 18 Jan 2022 13:41:17 +0800 Subject: [PATCH 1/4] =?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} + From be0cae7cdb3afc461fc0cb4f4d849799713bba9a Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 18 Jan 2022 13:52:56 +0800 Subject: [PATCH 2/4] =?UTF-8?q?/=E3=80=81order=20by?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCouponChannelController.java | 11 ++++++----- .../main/resources/mapper/WxCouponChannelMapper.xml | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index 6f6c710fe..725fd4f8f 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -64,11 +64,12 @@ public class WxCouponChannelController extends BaseController { wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()); - if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ - - }else{ - wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC); - } +// if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ +// +// }else{ +// wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC); +// } + wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC); wxCouponChannel.setShowBeginTime(new Date()); if(EnumCouponChannelType.COUPON_CHANNEL_ID_CARD.equals(wxCouponChannel.getTargetAd()) diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index c69c11dbf..1828c3e55 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} From 55df65e8514e94086d0b2bbebab3425481fcf635 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 18 Jan 2022 14:10:33 +0800 Subject: [PATCH 3/4] =?UTF-8?q?/=E3=80=81order=20by?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxCouponChannelController.java | 1 + .../com/iformall/service/impl/WxCouponChannelServiceImpl.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index 725fd4f8f..7ec8fd571 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -69,6 +69,7 @@ public class WxCouponChannelController extends BaseController { // }else{ // wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC); // } + wxCouponChannel.setSortColumn(null); wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC); wxCouponChannel.setShowBeginTime(new Date()); 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 e10e20c6e..be1154754 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -306,6 +306,9 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { if(wxCouponChannel.getSourceType() != null){ couponQ.setSourceType(wxCouponChannel.getSourceType()); } + if(wxCouponChannel.getSupportTransfer() != null){ + couponQ.setSupportTransfer(wxCouponChannel.getSupportTransfer()); + } List cids = wxCouponMapper.findIdList(couponQ); return cids; } From 1310a0857b7339605b1f7d0a2e0be2eb07ea7478 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 18 Jan 2022 14:17:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?/=E3=80=81card=20credit=20redis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxCouponChannelController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index 7ec8fd571..80b3fe640 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -73,8 +73,8 @@ public class WxCouponChannelController extends BaseController { wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC); wxCouponChannel.setShowBeginTime(new Date()); - if(EnumCouponChannelType.COUPON_CHANNEL_ID_CARD.equals(wxCouponChannel.getTargetAd()) - || EnumCouponChannelType.COUPON_CHANNEL_ID_CREDIT.equals(wxCouponChannel.getTargetAd())){ + if(EnumCouponChannelType.COUPON_CHANNEL_ID_CARD.getCode().equals(wxCouponChannel.getTargetAd()) + || EnumCouponChannelType.COUPON_CHANNEL_ID_CREDIT.getCode().equals(wxCouponChannel.getTargetAd())){ PageInfo page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize); filterTimed(wxCouponChannel, page); return new ResultData(page);