|
|
|
@@ -1,6 +1,8 @@ |
|
|
|
package com.iformall.controller; |
|
|
|
|
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
import com.iformall.domain.po.WxMerchant; |
|
|
|
import com.iformall.domain.po.WxMerchantBUser; |
|
|
|
import com.iformall.domain.vo.WxCouponChannelVo; |
|
|
|
import com.iformall.enums.EnumCouponChannelActivityStatus; |
|
|
|
import com.iformall.enums.EnumCouponChannelStatus; |
|
|
|
@@ -41,9 +43,28 @@ public class WxCouponChannelController extends BaseController { |
|
|
|
wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); |
|
|
|
wxCouponChannel.setSortColumns(WxCouponChannel.Field.UpdateDate_DESC); |
|
|
|
|
|
|
|
|
|
|
|
PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); |
|
|
|
filterTimed(wxCouponChannel, page); |
|
|
|
return new ResultData(page); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ApiOperation("商户活动列表信息") |
|
|
|
@GetMapping("listByMerchant") |
|
|
|
@ApiImplicitParams({ |
|
|
|
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), |
|
|
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) |
|
|
|
public ResultData listByMerchant(@ModelAttribute WxCouponChannel wxCouponChannel, Integer pageNum, Integer pageSize) { |
|
|
|
wxCouponChannel.setTenantId(getTenantId()); |
|
|
|
wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); |
|
|
|
wxCouponChannel.setSortColumns(WxCouponChannel.Field.UpdateDate_DESC); |
|
|
|
|
|
|
|
PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listByMerchant(wxCouponChannel,pageNum,pageSize); |
|
|
|
filterTimed(wxCouponChannel, page); |
|
|
|
return new ResultData(page); |
|
|
|
} |
|
|
|
|
|
|
|
private void filterTimed(WxCouponChannel wxCouponChannel, PageInfo<WxCouponChannelVo> page) { |
|
|
|
if (wxCouponChannel.getTargetAd()!= null && |
|
|
|
wxCouponChannel.getTargetAd().equals(EnumCouponChannelType.COUPON_CHANNEL_ID_TIMED.getCode())) { |
|
|
|
Date now = new Date(); |
|
|
|
@@ -57,8 +78,5 @@ public class WxCouponChannelController extends BaseController { |
|
|
|
} |
|
|
|
}); |
|
|
|
} |
|
|
|
|
|
|
|
return new ResultData(page); |
|
|
|
} |
|
|
|
|
|
|
|
} |