From 36506bd63ce9bf0c323b1202302155111bf344ea Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 29 Mar 2019 16:59:16 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=B8=93=E9=A2=98][=E6=B7=BB=E5=8A=A0][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=93=E9=A2=98=E5=8A=9F=E8=83=BD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxTopicController.java | 9 ----- .../controller/WxTopicController.java | 32 +++++++++++++++ .../java/com/iformall/domain/po/WxCoupon.java | 1 - .../com/iformall/domain/po/WxCouponTopic.java | 35 +++++++++++++++++ .../java/com/iformall/domain/po/WxTopic.java | 39 +++---------------- .../iformall/mapper/WxCouponTopicMapper.java | 4 ++ .../service/impl/WxTopicServiceImpl.java | 6 ++- .../resources/mapper/WxCouponTopicMapper.xml | 11 ++++-- .../main/resources/mapper/WxTopicMapper.xml | 4 +- 9 files changed, 91 insertions(+), 50 deletions(-) create mode 100644 mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java index a13288b68..edef36b0a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java @@ -39,14 +39,5 @@ public class WxTopicController extends BaseController { return new ResultData(); } - @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/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java new file mode 100644 index 000000000..13c746319 --- /dev/null +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java @@ -0,0 +1,32 @@ +package com.iformall.controller; + +import com.iformall.common.ResultData; +import com.iformall.domain.po.WxTopic; +import com.iformall.service.WxTopicService; +import io.swagger.annotations.Api; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("topic") +@Api(description = "专题相关接口") +public class WxTopicController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired + private WxTopicService wxTopicService; + + + + @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/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index cf4bb9204..263766313 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -49,7 +49,6 @@ public class WxCoupon implements Serializable { this.ids = ids; } - @Transient private String salePriceStr; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponTopic.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponTopic.java index 8e2bd5c4c..488ac79f8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponTopic.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponTopic.java @@ -2,6 +2,7 @@ package com.iformall.domain.po; import javax.persistence.Id; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; @Table(name = "wx_coupon_topic") @@ -19,6 +20,40 @@ public class WxCouponTopic implements Serializable { @io.swagger.annotations.ApiModelProperty(value="租户ID",name="busId") private String busId; + @io.swagger.annotations.ApiModelProperty(value="卷名称",name="couponName") + @Transient + private String couponName; + @io.swagger.annotations.ApiModelProperty(value="卷封面图片",name="couponPic") + @Transient + private String couponPic; + @io.swagger.annotations.ApiModelProperty(value="卷id",name="couponId") + @Transient + private String couponId; + + public String getCouponName() { + return couponName; + } + + public void setCouponName(String couponName) { + this.couponName = couponName; + } + + public String getCouponPic() { + return couponPic; + } + + public void setCouponPic(String couponPic) { + this.couponPic = couponPic; + } + + public String getCouponId() { + return couponId; + } + + public void setCouponId(String couponId) { + this.couponId = couponId; + } + public Long getId() { return id; } 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 865be69b6..7a0026c46 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java @@ -47,49 +47,22 @@ public class WxTopic implements Serializable { /*优惠券ids**/ @io.swagger.annotations.ApiModelProperty(value="优惠券ids",name="couponIds") - private String couponIds; - @Transient - private String couponName; - @Transient - private String couponPic; + private String couponIds; + /*商品列表**/ + @io.swagger.annotations.ApiModelProperty(value="商品列表",name="couponList") @Transient - private String couponId; - - public String getCouponName() { - return couponName; - } - - public void setCouponName(String couponName) { - this.couponName = couponName; - } + private List couponList; - public String getCouponPic() { - return couponPic; - } - - public void setCouponPic(String couponPic) { - this.couponPic = couponPic; - } - - public String getCouponId() { - return couponId; - } - - public void setCouponId(String couponId) { - this.couponId = couponId; - } - public List getCouponList() { + public List getCouponList() { return couponList; } - public void setCouponList(List couponList) { + public void setCouponList(List couponList) { this.couponList = couponList; } - private List couponList; - public String getCouponIds() { return couponIds; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponTopicMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponTopicMapper.java index 8463f3e22..d2fbcf153 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponTopicMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponTopicMapper.java @@ -2,9 +2,13 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxCouponTopic; +import com.iformall.domain.po.WxTopic; + +import java.util.List; public interface WxCouponTopicMapper extends CommonMapper { void del(WxCouponTopic couponTopic); + List findList(WxTopic wxTopic); } 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 f95705223..762673824 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java @@ -36,7 +36,11 @@ public class WxTopicServiceImpl implements WxTopicService { @Override public WxTopic show(WxTopic record) { - return wxTopicMapper.show(record); + WxTopic wxTopic = wxTopicMapper.show(record); + if(wxTopic != null) { + wxTopic.setCouponList(wxCouponTopicMapper.findList(record)); + } + return wxTopic; } @Override diff --git a/mallinkService/src/main/resources/mapper/WxCouponTopicMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponTopicMapper.xml index b9c7d3cf0..2517f3d39 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponTopicMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponTopicMapper.xml @@ -14,6 +14,9 @@ + + + @@ -42,14 +45,16 @@ delete from wx_coupon_topic where topic_id = #{topicId} - + + diff --git a/mallinkService/src/main/resources/mapper/WxTopicMapper.xml b/mallinkService/src/main/resources/mapper/WxTopicMapper.xml index a6123bad0..b1e79b807 100644 --- a/mallinkService/src/main/resources/mapper/WxTopicMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxTopicMapper.xml @@ -14,9 +14,7 @@ - - - +