| @@ -37,7 +37,7 @@ public class WxCouponChannelController extends BaseController { | |||||
| wxCouponChannel.setTenantId(getTenantId()); | wxCouponChannel.setTenantId(getTenantId()); | ||||
| wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); | wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); | ||||
| wxCouponChannel.setSortColumns(WxCouponChannel.Field.CreateDate_DESC); | wxCouponChannel.setSortColumns(WxCouponChannel.Field.CreateDate_DESC); | ||||
| wxCouponChannel.setIsCRequest(0);//标记为C端调用 | |||||
| return new ResultData(wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize)); | return new ResultData(wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize)); | ||||
| } | } | ||||
| @@ -40,6 +40,15 @@ public class WxCouponChannel implements Serializable { | |||||
| this.ids = ids; | this.ids = ids; | ||||
| } | } | ||||
| @Transient | |||||
| private Integer isCRequest; | |||||
| @Transient | |||||
| private Date startdate; | |||||
| @Transient | |||||
| private Date enddate; | |||||
| @Transient | @Transient | ||||
| protected List<Long> couponIds; | protected List<Long> couponIds; | ||||
| @@ -89,6 +98,13 @@ public class WxCouponChannel implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value="子频道ID",name="subTargetId") | @io.swagger.annotations.ApiModelProperty(value="子频道ID",name="subTargetId") | ||||
| private Long subTargetId; | private Long subTargetId; | ||||
| public Integer getIsCRequest() { | |||||
| return isCRequest; | |||||
| } | |||||
| public void setIsCRequest(Integer isCRequest) { | |||||
| this.isCRequest = isCRequest; | |||||
| } | |||||
| public String getTenantId() { | public String getTenantId() { | ||||
| return tenantId; | return tenantId; | ||||
| @@ -165,6 +181,22 @@ public class WxCouponChannel implements Serializable { | |||||
| this.subTargetId = subTargetId; | this.subTargetId = subTargetId; | ||||
| } | } | ||||
| public Date getStartdate() { | |||||
| return startdate; | |||||
| } | |||||
| public void setStartdate(Date startdate) { | |||||
| this.startdate = startdate; | |||||
| } | |||||
| public Date getEnddate() { | |||||
| return enddate; | |||||
| } | |||||
| public void setEnddate(Date enddate) { | |||||
| this.enddate = enddate; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| @@ -52,7 +52,11 @@ | |||||
| and cc.`business` = #{business} | and cc.`business` = #{business} | ||||
| </if> | </if> | ||||
| <if test=" null != beginTime and null != endTime and null != targetAd and 2 == targetAd"> | |||||
| <if test=" null != startdate and null!=enddate"> | |||||
| and cc.`create_date` between #{startdate} and #{enddate} | |||||
| </if> | |||||
| <if test="null !=isCRequest and null != targetAd and 2 == targetAd"> | |||||
| and cc.`begin_time` < now() | and cc.`begin_time` < now() | ||||
| and cc.`end_time` > now() | and cc.`end_time` > now() | ||||
| </if> | </if> | ||||
| @@ -68,6 +72,7 @@ | |||||
| <if test=" null != updateDate "> | <if test=" null != updateDate "> | ||||
| and cc.`update_date` = #{updateDate} | and cc.`update_date` = #{updateDate} | ||||
| </if> | </if> | ||||
| <if test=" null != subTargetId "> | <if test=" null != subTargetId "> | ||||
| and cc.`sub_target_id` = #{subTargetId} | and cc.`sub_target_id` = #{subTargetId} | ||||
| </if> | </if> | ||||