From f031bf8192a2ea21a9917d030178c133d2a2a89e Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 23 May 2019 10:24:32 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=95=86=E6=88=B7][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=95=86=E6=88=B7=E6=B7=BB=E5=8A=A0=E4=BC=98=E6=83=A0=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V201905231016__ADD_MERCHANT_ACTION.sql | 2 ++ .../src/main/java/com/iformall/domain/po/WxMerchant.java | 3 +++ .../src/main/java/com/iformall/domain/vo/WxMerchantVo.java | 3 +++ .../src/main/resources/mapper/WxMerchantMapper.xml | 7 +++++-- 4 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905231016__ADD_MERCHANT_ACTION.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905231016__ADD_MERCHANT_ACTION.sql b/mallinkAdmin/src/main/resources/db/migration/V201905231016__ADD_MERCHANT_ACTION.sql new file mode 100644 index 000000000..467f4acbf --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201905231016__ADD_MERCHANT_ACTION.sql @@ -0,0 +1,2 @@ +ALTER TABLE `wx_merchant` +ADD COLUMN `action_desc` VARCHAR(2048) NULL DEFAULT NULL AFTER `introduction`; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 7f2cbd977..be7ccb3fa 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -169,6 +169,9 @@ public class WxMerchant extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="简介",name="introduction") private String introduction; + @io.swagger.annotations.ApiModelProperty(value="优惠活动",name="actionDesc") + private String actionDesc; + @Transient private WxProfitSharingReceiver wxProfitSharingReceiver; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java index 5370e25c2..b3d1d1acf 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantVo.java @@ -78,4 +78,7 @@ public class WxMerchantVo { @io.swagger.annotations.ApiModelProperty(value="简介",name="introduction") private String introduction; + @io.swagger.annotations.ApiModelProperty(value="优惠活动",name="actionDesc") + private String actionDesc; + } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 5345fec31..c341852b4 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -26,11 +26,13 @@ + `id`,`tenant_id`,`img_url`,`name`,`link_phone`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`,`link_person`, - `business_id`,`sub_business_id`,`shop_type`,`brand`,`type`,`is_public`,email,`title`,`cover_picture`,`is_admin`,`bill_setting`,`qr_code`,`introduction` + `business_id`,`sub_business_id`,`shop_type`,`brand`,`type`,`is_public`,email,`title`,`cover_picture`,`is_admin`,`bill_setting`,`qr_code`, + `introduction`,`action_desc` @@ -122,7 +124,7 @@ m.id,m.img_url,m.name,m.link_phone,m.status,m.business_id, m.is_public,m.email,m.title,m.cover_picture,m.sub_business_id, - m.shop_type,m.introduction,bu.title as business_name + m.shop_type,m.introduction,m.action_desc,bu.title as business_name