diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
index 14cffb78b..47c18a6ff 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
@@ -1,12 +1,12 @@
package com.iformall.domain.po;
-import javax.persistence.*;
-import java.text.DecimalFormat;
-import java.util.*;
-import javax.persistence.Transient;
-import java.util.List;
import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
import java.io.Serializable;
+import java.text.DecimalFormat;
+import java.util.Date;
+import java.util.List;
@Table(name = "wx_coupon")
public class WxCoupon implements Serializable {
@@ -53,6 +53,12 @@ public class WxCoupon implements Serializable {
@Transient
private String priceStr;
+ @Transient
+ private Date startdate;
+
+ @Transient
+ private Date enddate;
+
/*租户ID**/
@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId;
@@ -322,6 +328,21 @@ public class WxCoupon implements Serializable {
this.channels = channels;
}
+ 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/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
index 9666c9613..8ec0c566f 100644
--- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
@@ -57,7 +57,7 @@
and `cover_img` like concat('%', #{coverImg},'%')
-
+
and `title` like concat('%', #{title},'%')
@@ -91,9 +91,9 @@
- and `valid_start_date` = #{validStartDate}
-
-
+ and `valid_start_date` = #{validStartDate}
+
+
and `valid_end_date` = #{validEndDate}
@@ -126,12 +126,12 @@
and `remark` like concat('%', #{remark},'%')
-
+
and `status` = #{status}
-
- and `create_date` = #{createDate}
+
+ and `create_date` between #{startdate} and #{enddate}