diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java
index 613980c68..85a773c45 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java
@@ -89,6 +89,14 @@ public class WxCampaign extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "活动类型1直接投放2限时投放", name = "activityType")
private Integer activityType;
+ @Transient
+ @io.swagger.annotations.ApiModelProperty(value = "开始时间", name = "starttime")
+ protected Date starttime;
+
+ @Transient
+ @io.swagger.annotations.ApiModelProperty(value = "结束时间", name = "endtime")
+ protected Date endtime;
+
@Transient
@io.swagger.annotations.ApiModelProperty(value="小程序路径",name="weappPath")
protected String weappPath;
diff --git a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml
index a47aead7f..e2ced761a 100644
--- a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml
@@ -22,12 +22,21 @@
+
+
+
+
+
+
+
+
`id`,`tenant_id`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`sub_title`,`use_price`,`discount_price`,`detail`,`valid_start_date`,`valid_end_date`,`img_detail`,`type`,`coupon_ids`,
- `mechant_id`,`sort_num`,`status`,`create_time`,`update_time`,`html`
+ `mechant_id`,`sort_num`,`status`,`create_time`,`update_time`,`html`,
+ `person_limit`,`activity_time`,`use_credit`,`credit`,`question`,`is_expired`,`activity_type`
@@ -114,6 +123,21 @@
and `update_time` = #{updateTime}
+
+
+ and `use_credit` = #{useCredit}
+
+
+ and `is_expired` = #{isExpired}
+
+
+ and `activity_type` = #{activityType}
+
+
+
+ and `create_time` between #{starttime} and #{endtime}
+
+
and id in