From be0cae7cdb3afc461fc0cb4f4d849799713bba9a Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 18 Jan 2022 13:52:56 +0800 Subject: [PATCH] =?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}