| @@ -33,6 +33,9 @@ public class WxTopicController extends BaseController { | |||||
| wxTopic.setTenantId(tenantId); | wxTopic.setTenantId(tenantId); | ||||
| PageInfo<WxTopic> page = wxTopicService.listAsPage(wxTopic, pageNum, pageSize); | PageInfo<WxTopic> page = wxTopicService.listAsPage(wxTopic, pageNum, pageSize); | ||||
| //可投放、已上线,时间区间查的是活动开始时间 | |||||
| //已下线、已作为,时间区间查的是活动结束时间 | |||||
| //设置正在上架的专题 | //设置正在上架的专题 | ||||
| Date now = new Date(); | Date now = new Date(); | ||||
| page.getList().stream().forEach(cc->{ | page.getList().stream().forEach(cc->{ | ||||
| @@ -32,10 +32,12 @@ public class WxCouponCVo extends WxCoupon implements Serializable { | |||||
| @Transient | @Transient | ||||
| private String priceStr; | private String priceStr; | ||||
| @Transient | @Transient | ||||
| private Integer activityStatus; | private Integer activityStatus; | ||||
| @Transient | |||||
| private String qrCode; | |||||
| @io.swagger.annotations.ApiModelProperty(value="券ID",name="couponId") | @io.swagger.annotations.ApiModelProperty(value="券ID",name="couponId") | ||||
| private Long couponId; | private Long couponId; | ||||
| @@ -574,7 +574,7 @@ | |||||
| ,count(distinct w.shop_id) xCount | ,count(distinct w.shop_id) xCount | ||||
| from wx_merchant_shop w | from wx_merchant_shop w | ||||
| where w.is_del=0 | where w.is_del=0 | ||||
| and w.tenant_id = 456 | |||||
| and w.tenant_id = #{tenantId} | |||||
| group by xTime | group by xTime | ||||
| order by xTime | order by xTime | ||||
| </select> | </select> | ||||
| @@ -33,12 +33,24 @@ | |||||
| <if test=" null != tenantId "> | <if test=" null != tenantId "> | ||||
| and `tenant_id` = #{tenantId} | and `tenant_id` = #{tenantId} | ||||
| </if> | </if> | ||||
| <if test=" null != beginTime "> | |||||
| and `begin_time` >= #{beginTime} | |||||
| <if test='statusStr =="0,2" or status==1'> | |||||
| <if test=" null != beginTime "> | |||||
| and `begin_time` >= #{beginTime} | |||||
| </if> | |||||
| <if test=" null != endTime "> | |||||
| and `begin_time` <= #{endTime} | |||||
| </if> | |||||
| </if> | </if> | ||||
| <if test=" null != endTime "> | |||||
| and `end_time` <= #{endTime} | |||||
| <if test='status ==2 or status==3'> | |||||
| <if test=" null != beginTime "> | |||||
| and `end_time` >= #{beginTime} | |||||
| </if> | |||||
| <if test=" null != endTime "> | |||||
| and `end_time` <= #{endTime} | |||||
| </if> | |||||
| </if> | </if> | ||||
| <if test=" null != status "> | <if test=" null != status "> | ||||
| and `status` = #{status} | and `status` = #{status} | ||||
| </if> | </if> | ||||