diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java index 50b79505c..9b2f05cc3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java @@ -33,6 +33,9 @@ public class WxTopicController extends BaseController { wxTopic.setTenantId(tenantId); PageInfo page = wxTopicService.listAsPage(wxTopic, pageNum, pageSize); + //可投放、已上线,时间区间查的是活动开始时间 + //已下线、已作为,时间区间查的是活动结束时间 + //设置正在上架的专题 Date now = new Date(); page.getList().stream().forEach(cc->{ diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java index a0ac8af7b..8a5adcf7e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponCVo.java @@ -32,10 +32,12 @@ public class WxCouponCVo extends WxCoupon implements Serializable { @Transient private String priceStr; - @Transient private Integer activityStatus; + @Transient + private String qrCode; + @io.swagger.annotations.ApiModelProperty(value="券ID",name="couponId") private Long couponId; diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index be0f76361..dbcc17885 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -574,7 +574,7 @@ ,count(distinct w.shop_id) xCount from wx_merchant_shop w where w.is_del=0 - and w.tenant_id = 456 + and w.tenant_id = #{tenantId} group by xTime order by xTime diff --git a/mallinkService/src/main/resources/mapper/WxTopicMapper.xml b/mallinkService/src/main/resources/mapper/WxTopicMapper.xml index ed1c06088..a9958b787 100644 --- a/mallinkService/src/main/resources/mapper/WxTopicMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxTopicMapper.xml @@ -33,12 +33,24 @@ and `tenant_id` = #{tenantId} - - and `begin_time` >= #{beginTime} + + + + and `begin_time` >= #{beginTime} + + + and `begin_time` <= #{endTime} + - - and `end_time` <= #{endTime} + + + and `end_time` >= #{beginTime} + + + and `end_time` <= #{endTime} + + and `status` = #{status}