From 50f81ba6cf80f264e11d2fcc0f2c5b2af6f9ceb2 Mon Sep 17 00:00:00 2001 From: hupeng Date: Tue, 8 Jan 2019 12:06:49 +0800 Subject: [PATCH] =?UTF-8?q?[BUG][1000764]:=E9=99=90=E6=97=B6=E6=8A=A2?= =?UTF-8?q?=E8=B4=AD=E6=B2=A1=E6=9C=89=E6=8C=89=E6=97=B6=E4=B8=8A=E6=9E=B6?= =?UTF-8?q?=E9=97=AE=E9=A2=98,A=E7=AB=AF=E6=97=B6=E9=97=B4=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E8=BF=87=E6=BB=A4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCouponChannelController.java | 2 +- .../iformall/domain/po/WxCouponChannel.java | 32 +++++++++++++++++++ .../mapper/WxCouponChannelMapper.xml | 7 +++- 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index d8bf0aad8..92a59b70c 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -37,7 +37,7 @@ public class WxCouponChannelController extends BaseController { wxCouponChannel.setTenantId(getTenantId()); wxCouponChannel.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); wxCouponChannel.setSortColumns(WxCouponChannel.Field.CreateDate_DESC); - + wxCouponChannel.setIsCRequest(0);//标记为C端调用 return new ResultData(wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize)); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java index 8e0d729d7..9c8938a2f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java @@ -40,6 +40,15 @@ public class WxCouponChannel implements Serializable { this.ids = ids; } + @Transient + private Integer isCRequest; + + @Transient + private Date startdate; + + @Transient + private Date enddate; + @Transient protected List couponIds; @@ -89,6 +98,13 @@ public class WxCouponChannel implements Serializable { @io.swagger.annotations.ApiModelProperty(value="子频道ID",name="subTargetId") private Long subTargetId; + public Integer getIsCRequest() { + return isCRequest; + } + + public void setIsCRequest(Integer isCRequest) { + this.isCRequest = isCRequest; + } public String getTenantId() { return tenantId; @@ -165,6 +181,22 @@ public class WxCouponChannel implements Serializable { 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 diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index ff7fa5c41..ed67253d4 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -52,7 +52,11 @@ and cc.`business` = #{business} - + + and cc.`create_date` between #{startdate} and #{enddate} + + + and cc.`begin_time` < now() and cc.`end_time` > now() @@ -68,6 +72,7 @@ and cc.`update_date` = #{updateDate} + and cc.`sub_target_id` = #{subTargetId}