From 4ca540c7767a6ef8e40b6808b24d52a21ed624e6 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 29 Mar 2019 17:23:34 +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 | 1 - .../com/iformall/domain/po/WxCouponTopic.java | 22 ++++++++++ .../java/com/iformall/domain/po/WxTopic.java | 6 +-- .../iformall/mapper/WxCouponTopicMapper.java | 3 +- .../service/impl/WxTopicServiceImpl.java | 2 +- .../resources/mapper/WxCouponTopicMapper.xml | 40 +++++++++++++++++-- .../main/resources/mapper/WxTopicMapper.xml | 7 ++-- 7 files changed, 68 insertions(+), 13 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java index edef36b0a..1b20a5f86 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java @@ -39,5 +39,4 @@ public class WxTopicController extends BaseController { return new ResultData(); } - } 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 488ac79f8..bddf29211 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponTopic.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponTopic.java @@ -4,6 +4,7 @@ import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; import java.io.Serializable; +import java.util.Date; @Table(name = "wx_coupon_topic") public class WxCouponTopic implements Serializable { @@ -19,6 +20,10 @@ public class WxCouponTopic implements Serializable { private String busType; @io.swagger.annotations.ApiModelProperty(value="租户ID",name="busId") private String busId; + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") + private Date createtime; + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") + private Date updatetime; @io.swagger.annotations.ApiModelProperty(value="卷名称",name="couponName") @Transient @@ -30,6 +35,23 @@ public class WxCouponTopic implements Serializable { @Transient private String couponId; + + public Date getCreatetime() { + return createtime; + } + + public void setCreatetime(Date createtime) { + this.createtime = createtime; + } + + public Date getUpdatetime() { + return updatetime; + } + + public void setUpdatetime(Date updatetime) { + this.updatetime = updatetime; + } + public String getCouponName() { return couponName; } 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 7a0026c46..8bbe5ba78 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java @@ -52,14 +52,14 @@ public class WxTopic implements Serializable { /*商品列表**/ @io.swagger.annotations.ApiModelProperty(value="商品列表",name="couponList") @Transient - private List couponList; + private List couponList; - public List getCouponList() { + public List getCouponList() { return couponList; } - public void setCouponList(List couponList) { + public void setCouponList(List couponList) { this.couponList = couponList; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponTopicMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponTopicMapper.java index d2fbcf153..e2e2b45d5 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponTopicMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponTopicMapper.java @@ -1,6 +1,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponTopic; import com.iformall.domain.po.WxTopic; @@ -10,5 +11,5 @@ public interface WxCouponTopicMapper extends CommonMapper void del(WxCouponTopic couponTopic); - List findList(WxTopic wxTopic); + 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 762673824..bf5705e8d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java @@ -38,7 +38,7 @@ public class WxTopicServiceImpl implements WxTopicService { public WxTopic show(WxTopic record) { WxTopic wxTopic = wxTopicMapper.show(record); if(wxTopic != null) { - wxTopic.setCouponList(wxCouponTopicMapper.findList(record)); + wxTopic.setCouponList(wxCouponTopicMapper.findList(wxTopic)); } return wxTopic; } diff --git a/mallinkService/src/main/resources/mapper/WxCouponTopicMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponTopicMapper.xml index 2517f3d39..a3cae28bf 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponTopicMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponTopicMapper.xml @@ -18,7 +18,41 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + where 1 = 1 @@ -44,8 +78,8 @@ order by createtime desc - + select wc.*,wc.title as couponName,wc.`cover_img` as couponPic,wc.id as couponId from wx_coupon_topic ct left join wx_coupon wc on wc.id = ct.bus_id where ct.`topic_id` = #{id} diff --git a/mallinkService/src/main/resources/mapper/WxTopicMapper.xml b/mallinkService/src/main/resources/mapper/WxTopicMapper.xml index b1e79b807..1337710f1 100644 --- a/mallinkService/src/main/resources/mapper/WxTopicMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxTopicMapper.xml @@ -48,10 +48,9 @@