From fd2e524af02b9dfe13103ebb62eadaa2b4adfe39 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 15 Apr 2019 11:36:27 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=B8=93=E9=A2=98][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9show=E9=80=BB=E8=BE=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxTopicController.java | 9 +++++++++ .../src/main/java/com/iformall/domain/po/WxTopic.java | 11 +++++++++++ .../src/main/resources/mapper/WxTopicMapper.xml | 5 ++++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java index 6e3c83b41..8e355a5f4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java @@ -57,4 +57,13 @@ public class WxTopicController extends BaseController { return wxTopicService.saveOrUpdate(wxTopic); } + @GetMapping("show") + public ResultData show() { + logger.debug("[" + getIpAddr() + "] WxTopicController::show"); + WxTopic wxTopic = new WxTopic(); + String tenantId = getTenantId(); + wxTopic.setTenantId(tenantId); + return new ResultData(wxTopicService.show(wxTopic)); + } + } 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 8e2daa2ee..01dbe6e3f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java @@ -67,6 +67,17 @@ public class WxTopic implements Serializable { @io.swagger.annotations.ApiModelProperty(value="上架标志 1正在上架",name="isOnline") @Transient private Integer isOnline; + @Transient + private Long couponChannelId; + + + public Long getCouponChannelId() { + return couponChannelId; + } + + public void setCouponChannelId(Long couponChannelId) { + this.couponChannelId = couponChannelId; + } public Integer getIsOnline() { return isOnline; diff --git a/mallinkService/src/main/resources/mapper/WxTopicMapper.xml b/mallinkService/src/main/resources/mapper/WxTopicMapper.xml index 87a4389ce..3fde58d3c 100644 --- a/mallinkService/src/main/resources/mapper/WxTopicMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxTopicMapper.xml @@ -15,6 +15,8 @@ + + @@ -56,7 +58,8 @@