diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java index 226e65ae2..2b5edaa6f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java @@ -67,14 +67,15 @@ public class WxCouponChannelController extends BaseController { wxCouponChannel.setStatus(null); } wxCouponChannel.updateTenantInfo(getTenantInfo()); - wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); if(null == wxCouponChannel.getSourceType()){ wxCouponChannel.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); } if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ - wxCouponChannel.setSortColumn("cc."+wxCouponChannel.getSortColumn()); +// + }else{ + wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); } final PageInfo page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); return new ResultData(page); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index d42a7738f..450196ac5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -74,7 +74,9 @@ public class WxCouponController extends BaseController { wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); } if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ - wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn()); + String coryColumn = "c."+wxCoupon.getSortColumns(); + wxCoupon.setSortColumn(coryColumn); + wxCoupon.setSortColumn(null); } if(wxCoupon.getTargetAd() != null && wxCoupon.getTargetAd() == EnumCouponChannelType.COUPON_CHANNEL_ID_TIMED.getCode()){ Integer[] typeArray = { @@ -111,7 +113,9 @@ public class WxCouponController extends BaseController { wxCoupon.setTypes(Arrays.asList(typeArray)); if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ - wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn()); + String coryColumn = "c."+wxCoupon.getSortColumns(); + wxCoupon.setSortColumn(coryColumn); + wxCoupon.setSortColumn(null); } return wxCouponService.list(wxCoupon,wxCoupon, pageNum, pageSize); //全列表 } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java index fb5e115ff..195eeea74 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java @@ -54,10 +54,14 @@ public class MemCouponController extends BaseController { wxCouponChannel.updateTenantInfo(getTenantInfo()); wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_H5.getCode()); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); - wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); + if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ - wxCouponChannel.setSortColumn("cc."+wxCouponChannel.getSortColumn()); +// String coryColumn = "c."+wxCouponChannel.getSortColumns(); +// wxCouponChannel.setSortColumn(coryColumn); +// wxCouponChannel.setSortColumn(null); + }else{ + wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); } final PageInfo page = couponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); return new ResultData(page); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index c5600fef3..06a35a1eb 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -60,10 +60,11 @@ public class WxCouponChannelController extends BaseController { } wxCouponChannel.setMerchantId(getLoginBUser().getMerchantId()); wxCouponChannel.updateTenantInfo(getTenantInfo()); - wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ - wxCouponChannel.setSortColumn("cc."+wxCouponChannel.getSortColumn()); +// + }else{ + wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); } final PageInfo page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); return new ResultData(page); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java index 7a76ad2f0..9d4434226 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -71,7 +71,9 @@ public class WxCouponController extends BaseController { wxCoupon.setMerchantId(getLoginBUser().getMerchantId()); if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ - wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn()); + String coryColumn = "c."+wxCoupon.getSortColumns(); + wxCoupon.setSortColumn(coryColumn); + wxCoupon.setSortColumn(null); } return wxCouponService.list(wxCoupon,wxCoupon, pageNum, pageSize); //全列表 @@ -99,7 +101,9 @@ public class WxCouponController extends BaseController { wxCoupon.setTypes(Arrays.asList(typeArray)); wxCoupon.setMerchantId(getLoginBUser().getMerchantId()); if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ - wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn()); + String coryColumn = "c."+wxCoupon.getSortColumns(); + wxCoupon.setSortColumn(coryColumn); + wxCoupon.setSortColumn(null); } return wxCouponService.list(wxCoupon,wxCoupon, pageNum, pageSize); //全列表 } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index 42b06b9a2..cf192f240 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -56,9 +56,7 @@ public class WxCouponChannelController extends BaseController { wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()); if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ -// String coryColumn = "c."+wxCouponChannel.getSortColumns(); -// wxCouponChannel.setSortColumns(coryColumn); -// wxCouponChannel.setSortColumn(null); + }else{ wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC); }