|
|
@@ -73,8 +73,8 @@ public class WxCouponChannelController extends BaseController { |
|
|
wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC); |
|
|
wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC, BaseEntity.SortField.CCId_DESC); |
|
|
wxCouponChannel.setShowBeginTime(new Date()); |
|
|
wxCouponChannel.setShowBeginTime(new Date()); |
|
|
|
|
|
|
|
|
if(EnumCouponChannelType.COUPON_CHANNEL_ID_CARD.equals(wxCouponChannel.getTargetAd()) |
|
|
|
|
|
|| EnumCouponChannelType.COUPON_CHANNEL_ID_CREDIT.equals(wxCouponChannel.getTargetAd())){ |
|
|
|
|
|
|
|
|
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); |
|
|
PageInfo<WxCouponChannelVo> page = wxCouponChannelService.newListPageVo(wxCouponChannel, pageNum, pageSize); |
|
|
filterTimed(wxCouponChannel, page); |
|
|
filterTimed(wxCouponChannel, page); |
|
|
return new ResultData(page); |
|
|
return new ResultData(page); |
|
|
|