From e06016e04a693642c40be05747f4e0a734d58d1c Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 20 May 2019 14:45:02 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8D=A1=E5=88=B8=E8=AF=A6=E6=83=85=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=A4=9A=E5=9B=BE][=E4=BF=AE=E6=94=B9]:=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=94=AF=E6=8C=81=E5=A4=9A=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V201905201349__ADD_COUPON_DETAIL_IMG.sql | 7 ++++++ ...905201350__ADD_CAMPAIGN_DETAIL_PICTURE.sql | 7 ++++++ ...201905201351__ADD_TOPIC_DETAIL_PICTURE.sql | 7 ++++++ .../com/iformall/domain/po/WxCampaign.java | 2 ++ .../java/com/iformall/domain/po/WxCoupon.java | 2 ++ .../java/com/iformall/domain/po/WxTopic.java | 2 ++ .../java/com/iformall/domain/vo/WxCardVo.java | 2 ++ .../resources/mapper/WxCampaignMapper.xml | 6 ++--- .../resources/mapper/WxCardInfoMapper.xml | 3 ++- .../mapper/WxCouponChannelMapper.xml | 3 ++- .../main/resources/mapper/WxCouponMapper.xml | 24 ++++--------------- .../main/resources/mapper/WxTopicMapper.xml | 3 ++- 12 files changed, 43 insertions(+), 25 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905201349__ADD_COUPON_DETAIL_IMG.sql create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905201350__ADD_CAMPAIGN_DETAIL_PICTURE.sql create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905201351__ADD_TOPIC_DETAIL_PICTURE.sql 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 - - select ct.id as id,wc.id as couponId, - wc.tenant_id,wc.`type`,wc.`cover_img`,wc.`cover_picture`,wc.`title`,wc.`sub_title`,wc.`sale_price`,wc.`use_price`,wc.`use_limit_quantity`,wc.`send_type`, + wc.tenant_id,wc.`type`,wc.`cover_img`,wc.`cover_picture`,wc.`detail_picture`,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.`cover_picture` as couponPicture,wc.id as couponId from wx_coupon_channel ct left join + ,wc.title as couponName,wc.`cover_img` as couponPic,wc.`cover_picture` as couponPicture,wc.`detail_picture` as detailPicture,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} diff --git a/mallinkService/src/main/resources/mapper/WxTopicMapper.xml b/mallinkService/src/main/resources/mapper/WxTopicMapper.xml index 9f019fa3a..ed1c06088 100644 --- a/mallinkService/src/main/resources/mapper/WxTopicMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxTopicMapper.xml @@ -9,6 +9,7 @@ + @@ -21,7 +22,7 @@ - `id`,`tenant_id`,`name`,`title`,`content`,`cover`,`cover_picture`,`advert`,`begin_time`,`end_time`,`createtime`,`updatetime`,`bg_color` + `id`,`tenant_id`,`name`,`title`,`content`,`cover`,`cover_picture`,`detail_picture`,`advert`,`begin_time`,`end_time`,`createtime`,`updatetime`,`bg_color`