| @@ -67,14 +67,15 @@ public class WxCouponChannelController extends BaseController { | |||||
| wxCouponChannel.setStatus(null); | wxCouponChannel.setStatus(null); | ||||
| } | } | ||||
| wxCouponChannel.updateTenantInfo(getTenantInfo()); | wxCouponChannel.updateTenantInfo(getTenantInfo()); | ||||
| wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); | |||||
| if(null == wxCouponChannel.getSourceType()){ | if(null == wxCouponChannel.getSourceType()){ | ||||
| wxCouponChannel.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); | wxCouponChannel.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); | ||||
| } | } | ||||
| if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ | if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ | ||||
| wxCouponChannel.setSortColumn("cc."+wxCouponChannel.getSortColumn()); | |||||
| // | |||||
| }else{ | |||||
| wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); | |||||
| } | } | ||||
| final PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); | final PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -74,7 +74,9 @@ public class WxCouponController extends BaseController { | |||||
| wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); | wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); | ||||
| } | } | ||||
| if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ | 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()){ | if(wxCoupon.getTargetAd() != null && wxCoupon.getTargetAd() == EnumCouponChannelType.COUPON_CHANNEL_ID_TIMED.getCode()){ | ||||
| Integer[] typeArray = { | Integer[] typeArray = { | ||||
| @@ -111,7 +113,9 @@ public class WxCouponController extends BaseController { | |||||
| wxCoupon.setTypes(Arrays.asList(typeArray)); | wxCoupon.setTypes(Arrays.asList(typeArray)); | ||||
| if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ | 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); //全列表 | return wxCouponService.list(wxCoupon,wxCoupon, pageNum, pageSize); //全列表 | ||||
| } | } | ||||
| @@ -54,10 +54,14 @@ public class MemCouponController extends BaseController { | |||||
| wxCouponChannel.updateTenantInfo(getTenantInfo()); | wxCouponChannel.updateTenantInfo(getTenantInfo()); | ||||
| wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_H5.getCode()); | wxCouponChannel.setTargetAd(EnumCouponChannelType.COUPON_CHANNEL_ID_H5.getCode()); | ||||
| wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); | wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); | ||||
| wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); | |||||
| if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ | 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<WxCouponChannelVo> page = couponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); | final PageInfo<WxCouponChannelVo> page = couponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -60,10 +60,11 @@ public class WxCouponChannelController extends BaseController { | |||||
| } | } | ||||
| wxCouponChannel.setMerchantId(getLoginBUser().getMerchantId()); | wxCouponChannel.setMerchantId(getLoginBUser().getMerchantId()); | ||||
| wxCouponChannel.updateTenantInfo(getTenantInfo()); | wxCouponChannel.updateTenantInfo(getTenantInfo()); | ||||
| wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); | |||||
| if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ | if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ | ||||
| wxCouponChannel.setSortColumn("cc."+wxCouponChannel.getSortColumn()); | |||||
| // | |||||
| }else{ | |||||
| wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); | |||||
| } | } | ||||
| final PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); | final PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -71,7 +71,9 @@ public class WxCouponController extends BaseController { | |||||
| wxCoupon.setMerchantId(getLoginBUser().getMerchantId()); | wxCoupon.setMerchantId(getLoginBUser().getMerchantId()); | ||||
| if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ | 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); //全列表 | return wxCouponService.list(wxCoupon,wxCoupon, pageNum, pageSize); //全列表 | ||||
| @@ -99,7 +101,9 @@ public class WxCouponController extends BaseController { | |||||
| wxCoupon.setTypes(Arrays.asList(typeArray)); | wxCoupon.setTypes(Arrays.asList(typeArray)); | ||||
| wxCoupon.setMerchantId(getLoginBUser().getMerchantId()); | wxCoupon.setMerchantId(getLoginBUser().getMerchantId()); | ||||
| if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ | 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); //全列表 | return wxCouponService.list(wxCoupon,wxCoupon, pageNum, pageSize); //全列表 | ||||
| } | } | ||||
| @@ -56,9 +56,7 @@ public class WxCouponChannelController extends BaseController { | |||||
| wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()); | wxCouponChannel.setCouponStatus(EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode()); | ||||
| if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ | if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ | ||||
| // String coryColumn = "c."+wxCouponChannel.getSortColumns(); | |||||
| // wxCouponChannel.setSortColumns(coryColumn); | |||||
| // wxCouponChannel.setSortColumn(null); | |||||
| }else{ | }else{ | ||||
| wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC); | wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC); | ||||
| } | } | ||||