From 2a9a31910fdc5381e21120335cb04520a556daba Mon Sep 17 00:00:00 2001
From: luozukai <luozukai@okjiaoyu.cn>
Date: Fri, 26 Apr 2019 19:36:36 +0800
Subject: [PATCH 1/4] =?UTF-8?q?[=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1][?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E5=87=BA=E7=A7=9F?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/iformall/domain/po/WxCoupon.java    | 11 +++++++++++
 .../src/main/resources/mapper/WxCouponMapper.xml      |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

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 e2df39f3f..3361ad657 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
@@ -188,6 +188,9 @@ public class WxCoupon implements Serializable {
 	@Transient
 	private Integer targetAd;
 
+	private Long couponId;
+
+
 	//营销分析
 	private WxCouponStatisVo wxCouponStatisVo;
 
@@ -348,6 +351,14 @@ public class WxCoupon implements Serializable {
 		subBusiness = _subBusiness;
 	}
 
+	public Long getCouponId() {
+		return couponId;
+	}
+
+	public void setCouponId(Long couponId) {
+		this.couponId = couponId;
+	}
+
 	public Integer getSupportTransfer() {
 		return supportTransfer;
 	}
diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
index 8e3d0ece4..b05e13719 100644
--- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
@@ -765,7 +765,7 @@
     </select>
 
     <select id="findCouponByTopic" parameterType="com.iformall.domain.po.WxTopic" resultType="com.iformall.domain.po.WxCoupon">
-       select wc.* from wx_coupon_channel ct left join
+       select wc.*,ct.id as couponId from wx_coupon_channel ct left join
 		wx_coupon wc on wc.id = ct.coupon_id
 		where ct.`sub_target_id` = #{id}
     </select>

From 8ee8560480b118d24db7e26ddc67071648313857 Mon Sep 17 00:00:00 2001
From: luozukai <luozukai@okjiaoyu.cn>
Date: Fri, 26 Apr 2019 19:50:56 +0800
Subject: [PATCH 2/4] =?UTF-8?q?[=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1][?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E5=87=BA=E7=A7=9F?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/WxCouponMapper.xml           | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
index b05e13719..06402eb4d 100644
--- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
@@ -765,7 +765,12 @@
     </select>
 
     <select id="findCouponByTopic" parameterType="com.iformall.domain.po.WxTopic" resultType="com.iformall.domain.po.WxCoupon">
-       select wc.*,ct.id as couponId from wx_coupon_channel ct left join
+       select ct.id as id,wc.id as couponId
+        wc.tenant_id,wc.`type`,wc.`cover_img`,wc.`title`,wc.`sub_title`,wc.`sale_price`,wc.`use_price`,wc.`use_limit_quantity`,wc.`send_type`,
+        wc.`valid_type`,wc.`valid_start_date`,wc.`valid_end_date`,wc.`valid_days`,wc.`detail`,wc.`price`,wc.`unit`,wc.`remain_inventory`,wc.`inventory`,
+        wc.`remark`,wc.`status`,wc.`create_date`,wc.`update_date`,wc.`business`,wc.`sub_business`,wc.`support_transfer`,wc.`subsidy_num`,wc.`subsidy_type`,
+        wc.`press_limit_num`, wc.`press_limit_hours`, wc.`auto_refund`,wc.`credit_price`,wc.`credit_refund`
+        ,wc.title as couponName,wc.`cover_img` as couponPic,wc.id as couponId from wx_coupon_channel ct left join
 		wx_coupon wc on wc.id = ct.coupon_id
 		where ct.`sub_target_id` = #{id}
     </select>

From c0ba589e37b59a8ada9b82e194ba65e30f1da047 Mon Sep 17 00:00:00 2001
From: luozukai <luozukai@okjiaoyu.cn>
Date: Fri, 26 Apr 2019 19:51:17 +0800
Subject: [PATCH 3/4] =?UTF-8?q?[=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1][?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E5=87=BA=E7=A7=9F?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mallinkService/src/main/resources/mapper/WxCouponMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
index 06402eb4d..90fcd493a 100644
--- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
@@ -765,7 +765,7 @@
     </select>
 
     <select id="findCouponByTopic" parameterType="com.iformall.domain.po.WxTopic" resultType="com.iformall.domain.po.WxCoupon">
-       select ct.id as id,wc.id as couponId
+       select ct.id as id,wc.id as couponId,
         wc.tenant_id,wc.`type`,wc.`cover_img`,wc.`title`,wc.`sub_title`,wc.`sale_price`,wc.`use_price`,wc.`use_limit_quantity`,wc.`send_type`,
         wc.`valid_type`,wc.`valid_start_date`,wc.`valid_end_date`,wc.`valid_days`,wc.`detail`,wc.`price`,wc.`unit`,wc.`remain_inventory`,wc.`inventory`,
         wc.`remark`,wc.`status`,wc.`create_date`,wc.`update_date`,wc.`business`,wc.`sub_business`,wc.`support_transfer`,wc.`subsidy_num`,wc.`subsidy_type`,

From 44e5def18cdbdea656ace87b978e6719244ce91b Mon Sep 17 00:00:00 2001
From: luozukai <luozukai@okjiaoyu.cn>
Date: Fri, 26 Apr 2019 20:09:59 +0800
Subject: [PATCH 4/4] =?UTF-8?q?[=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1][?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E5=87=BA=E7=A7=9F?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/iformall/domain/po/WxCoupon.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 3361ad657..57322feae 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
@@ -187,7 +187,7 @@ public class WxCoupon implements Serializable {
 	/**投放频道参数,用来过滤**/
 	@Transient
 	private Integer targetAd;
-
+	@Transient
 	private Long couponId;