From 55df65e8514e94086d0b2bbebab3425481fcf635 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 18 Jan 2022 14:10:33 +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 --- .../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; }