|
|
@@ -64,12 +64,21 @@ public class WxCouponChannelController extends BaseController { |
|
|
wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); |
|
|
wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); |
|
|
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())){ |
|
|
|
|
|
// |
|
|
|
|
|
// }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()); |
|
|
|
|
|
|
|
|
}else{ |
|
|
|
|
|
wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC); |
|
|
|
|
|
|
|
|
if(EnumCouponChannelType.COUPON_CHANNEL_ID_CARD.getCode().equals(wxCouponChannel.getTargetAd()) |
|
|
|
|
|
|| EnumCouponChannelType.COUPON_CHANNEL_ID_CREDIT.getCode().equals(wxCouponChannel.getTargetAd())){ |
|
|
|
|
|
PageInfo<WxCouponChannelVo> page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize); |
|
|
|
|
|
filterTimed(wxCouponChannel, page); |
|
|
|
|
|
return new ResultData(page); |
|
|
} |
|
|
} |
|
|
wxCouponChannel.setShowBeginTime(new Date()); |
|
|
|
|
|
|
|
|
|
|
|
String key = EnumCacheKey.C_INDEX_PAGE_LIST.getMessage() |
|
|
String key = EnumCacheKey.C_INDEX_PAGE_LIST.getMessage() |
|
|
+ wxCouponChannel.getTenantId() + "_" |
|
|
+ wxCouponChannel.getTenantId() + "_" |
|
|
|