diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905201349__ADD_COUPON_DETAIL_IMG.sql b/mallinkAdmin/src/main/resources/db/migration/V201905201349__ADD_COUPON_DETAIL_IMG.sql
new file mode 100644
index 000000000..c836e197f
--- /dev/null
+++ b/mallinkAdmin/src/main/resources/db/migration/V201905201349__ADD_COUPON_DETAIL_IMG.sql
@@ -0,0 +1,7 @@
+
+
+
+ALTER TABLE wx_coupon
+ ADD COLUMN `detail_picture` json DEFAULT null COMMENT '详情多图' after `cover_picture`;
+
+UPDATE wx_coupon SET detail_picture='[]' WHERE detail_picture is null;
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905201350__ADD_CAMPAIGN_DETAIL_PICTURE.sql b/mallinkAdmin/src/main/resources/db/migration/V201905201350__ADD_CAMPAIGN_DETAIL_PICTURE.sql
new file mode 100644
index 000000000..9fb958e29
--- /dev/null
+++ b/mallinkAdmin/src/main/resources/db/migration/V201905201350__ADD_CAMPAIGN_DETAIL_PICTURE.sql
@@ -0,0 +1,7 @@
+
+
+
+ALTER TABLE wx_campaign
+ ADD COLUMN `detail_picture` json DEFAULT null COMMENT '详情多图' after `cover_picture`;
+
+UPDATE wx_campaign SET detail_picture='[]' WHERE detail_picture is null;
\ No newline at end of file
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905201351__ADD_TOPIC_DETAIL_PICTURE.sql b/mallinkAdmin/src/main/resources/db/migration/V201905201351__ADD_TOPIC_DETAIL_PICTURE.sql
new file mode 100644
index 000000000..9e9237000
--- /dev/null
+++ b/mallinkAdmin/src/main/resources/db/migration/V201905201351__ADD_TOPIC_DETAIL_PICTURE.sql
@@ -0,0 +1,7 @@
+
+
+
+ALTER TABLE wx_topic
+ ADD COLUMN `detail_picture` json DEFAULT null COMMENT '详情多图' after `cover_picture`;
+
+UPDATE wx_topic SET detail_picture='[]' WHERE detail_picture is null;
\ No newline at end of file
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java
index ff7976c32..3e2f96bf7 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java
@@ -40,6 +40,8 @@ public class WxCampaign extends BaseEntity {
private String coverImg;
@io.swagger.annotations.ApiModelProperty(value="多封面图",name="coverPicture")
private String coverPicture;
+ @io.swagger.annotations.ApiModelProperty(value="详情多图",name="detailPicture")
+ private String detailPicture;
@io.swagger.annotations.ApiModelProperty(value="主标题",name="title")
private String title;
@io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle")
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 fa77eab33..cab74561e 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
@@ -74,6 +74,8 @@ public class WxCoupon extends BaseEntity {
private String coverImg;
@io.swagger.annotations.ApiModelProperty(value="多封面图",name="coverPicture")
private String coverPicture;
+ @io.swagger.annotations.ApiModelProperty(value="详情多图",name="detailPicture")
+ private String detailPicture;
@io.swagger.annotations.ApiModelProperty(value="券名称",name="title")
private String title;
@io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle")
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 edae91d6c..488d53658 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java
@@ -30,6 +30,8 @@ public class WxTopic extends BaseEntity {
private String cover;
@io.swagger.annotations.ApiModelProperty(value="多封面",name="coverPicture")
private String coverPicture;
+ @io.swagger.annotations.ApiModelProperty(value="详情多图",name="detailPicture")
+ private String detailPicture;
@io.swagger.annotations.ApiModelProperty(value="广告图",name="advert")
private String advert;
@io.swagger.annotations.ApiModelProperty(value="开始时间",name="beginTime")
diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java
index d2c1dd560..18cfe006e 100644
--- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java
+++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java
@@ -20,6 +20,8 @@ public class WxCardVo extends WxCardInfo {
private String coverImg;
@io.swagger.annotations.ApiModelProperty(value="多封面图",name="coverPicture")
private String coverPicture;
+ @io.swagger.annotations.ApiModelProperty(value="详情多图",name="detailPicture")
+ private String detailPicture;
@io.swagger.annotations.ApiModelProperty(value="券名称",name="title")
private String title;
@io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle")
diff --git a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml
index dfa010b71..a47aead7f 100644
--- a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml
@@ -26,16 +26,16 @@
- `id`,`tenant_id`,`cover_img`,`cover_picture`,`title`,`sub_title`,`use_price`,`discount_price`,`detail`,`valid_start_date`,`valid_end_date`,`img_detail`,`type`,`coupon_ids`,
+ `id`,`tenant_id`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`sub_title`,`use_price`,`discount_price`,`detail`,`valid_start_date`,`valid_end_date`,`img_detail`,`type`,`coupon_ids`,
`mechant_id`,`sort_num`,`status`,`create_time`,`update_time`,`html`
- `id`,`tenant_id`,`cover_img`,`cover_picture`,`title`,`type`,`sort_num`
+ `id`,`tenant_id`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`type`,`sort_num`
- `id`,`tenant_id`,`cover_img`,`cover_picture`,`title`,`sub_title`,`use_price`,`discount_price`,`detail`,`valid_start_date`,`valid_end_date`,`img_detail`,`type`,`coupon_ids`,
+ `id`,`tenant_id`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`sub_title`,`use_price`,`discount_price`,`detail`,`valid_start_date`,`valid_end_date`,`img_detail`,`type`,`coupon_ids`,
`mechant_id`,`sort_num`,`status`,`create_time`,`update_time`
diff --git a/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml
index 57f8d9921..cb30ce52a 100644
--- a/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml
@@ -89,6 +89,7 @@
+
@@ -113,7 +114,7 @@
ci.`id`,ci.`tenant_id`,ci.`coupon_id`,ci.`transaction_id`,ci.`amount`,ci.`sale_amount`,ci.`remaining_amount`,ci.`service_fee_amount`,ci.`share_fee_amount`,ci.`remaining_share_fee_amount`,
ci.`create_date`,ci.`update_date`,
- c.`cover_img`, c.`cover_picture`,c.`title`, c.`sub_title`, c.`detail`, c.`unit`, c.`remark`, c.`sale_price`, c.`price`, c.`subsidy_type`, c.`subsidy_num`,
+ c.`cover_img`, c.`cover_picture`,c.`detail_picture`,c.`title`, c.`sub_title`, c.`detail`, c.`unit`, c.`remark`, c.`sale_price`, c.`price`, c.`subsidy_type`, c.`subsidy_num`,
co.`c_user_id`, co.`owner_id`, co.`expired_time`, co.`coupon_order_status` as status,
cu.`nick_name` as c_nick_name, ou.`nick_name` as o_nick_name, ou.`phone` as ou_phone
diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml
index dc70338a1..d03421702 100644
--- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml
@@ -198,7 +198,7 @@
cc.id,cc.coupon_id,cc.target_ad,cc.begin_time,cc.end_time,
- c.tenant_id,c.type,c.cover_img,c.cover_picture,c.title,c.sub_title,c.sale_price,c.use_price,
+ c.tenant_id,c.type,c.cover_img,c.cover_picture,c.detail_picture,c.title,c.sub_title,c.sale_price,c.use_price,
c.use_limit_quantity,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date,
c.valid_days,c.detail,c.price,c.unit,c.remain_inventory,c.inventory,c.remark,c.status,
c.create_date,c.update_date,c.business,c.sub_business,c.support_transfer,c.press_limit_num, c.auto_refund,c.credit_price
@@ -216,6 +216,7 @@
+
diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
index b50a1b706..f131cf946 100644
--- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml
@@ -7,6 +7,7 @@
+
@@ -86,7 +87,7 @@
- `id`,`tenant_id`,`type`,`cover_img`,`cover_picture`,`title`,`sub_title`,`sale_price`,`use_price`,`use_limit_quantity`,`send_type`,
+ `id`,`tenant_id`,`type`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`sub_title`,`sale_price`,`use_price`,`use_limit_quantity`,`send_type`,
`valid_type`,`valid_start_date`,`valid_end_date`,`valid_days`,`detail`,`price`,`unit`,`remain_inventory`,`inventory`,
`remark`,`status`,`create_date`,`update_date`,`business`,`sub_business`,`support_transfer`,`subsidy_num`,`subsidy_type`,
`press_limit_num`, `press_limit_hours`, `auto_refund`,`credit_price`,`credit_refund`
@@ -429,6 +430,7 @@
+
@@ -649,22 +651,6 @@
order by c.status asc,c.create_date desc
-
-