diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java index c74f5cb60..3e1d0a3d9 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java @@ -26,6 +26,14 @@ public class WxTopicController extends BaseController { return new ResultData(wxTopicService.show(wxTopic)); } + @GetMapping("showList") + public ResultData showList() { + logger.debug("[" + getIpAddr() + "] WxTopicController::showList"); + WxTopic wxTopic = new WxTopic(); + wxTopic.updateTenantInfo(getTenantInfo()); + return new ResultData(wxTopicService.showList(wxTopic)); + } + @GetMapping("findById") public ResultData findById(WxTopic wxTopic) { logger.debug("[" + getIpAddr() + "] WxTopicController::findById"); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java index 7fb391899..c0709fcf7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java @@ -68,9 +68,6 @@ public class WxTopic extends TenantEntity { @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="上架标志 1正在上架",name="isOnline") private Integer isOnline; - @TableField(exist = false) - @io.swagger.annotations.ApiModelProperty(value="couponChannelId渠道ID",name="couponChannelId") - private Long couponChannelId; @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="小程序路径",name="weappPath") diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxTopicMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxTopicMapper.java index 00da1d2bc..02d021600 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxTopicMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxTopicMapper.java @@ -12,8 +12,10 @@ public interface WxTopicMapper extends CommonMapper { List findExist(WxTopic wxTopic); WxTopic show(WxTopic record); + List showList(WxTopic record); void updateStatus(WxTopic record); void couponDownLine(WxTopic record); + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxTopicService.java b/mallinkService/src/main/java/com/iformall/service/WxTopicService.java index f70879677..25697d582 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxTopicService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxTopicService.java @@ -5,6 +5,8 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxTopic; import com.iformall.enums.EnumPayWay; +import java.util.List; + public interface WxTopicService { /** @@ -20,6 +22,9 @@ public interface WxTopicService { ResultData saveOrUpdate(WxTopic record); WxTopic show(WxTopic record); + List showList(WxTopic record); WxTopic findById(WxTopic record); + + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java index 06def3a7e..8534a171d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java @@ -68,6 +68,15 @@ public class WxTopicServiceImpl implements WxTopicService { return wxTopic; } + @Override + public List showList(WxTopic record) { + List topicList = wxTopicMapper.showList(record); + for (WxTopic topic:topicList) { + topic.setCouponList(wxCouponMapper.findCouponByTopic(record)); + } + return topicList; + } + @Override public ResultData saveOrUpdate(WxTopic record) { //验证是否存在已发放的专题 diff --git a/mallinkService/src/main/resources/mapper/WxTopicMapper.xml b/mallinkService/src/main/resources/mapper/WxTopicMapper.xml index 54dae5c43..63c650ce7 100644 --- a/mallinkService/src/main/resources/mapper/WxTopicMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxTopicMapper.xml @@ -18,7 +18,6 @@ - @@ -83,13 +82,21 @@ + + update wx_topic set status = 3 where id in( select t.id from (