From 0874eed48a1aff3bda928c992a9fd1c8448b7fec Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 10 Dec 2021 18:36:35 +0800 Subject: [PATCH] =?UTF-8?q?/=E3=80=81mould=5Ftype?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V2021120900001__add_topic_type.sql | 2 -- .../resources/db/migration/V2021120900001__add_type.sql | 6 ++++++ .../src/main/java/com/iformall/domain/po/WxAppinfo.java | 2 ++ .../src/main/resources/mapper/WxAppinfoMapper.xml | 3 ++- 4 files changed, 10 insertions(+), 3 deletions(-) delete mode 100644 mallinkAdmin/src/main/resources/db/migration/V2021120900001__add_topic_type.sql create mode 100644 mallinkAdmin/src/main/resources/db/migration/V2021120900001__add_type.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V2021120900001__add_topic_type.sql b/mallinkAdmin/src/main/resources/db/migration/V2021120900001__add_topic_type.sql deleted file mode 100644 index 0dfb12edd..000000000 --- a/mallinkAdmin/src/main/resources/db/migration/V2021120900001__add_topic_type.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE `mallink`.`wx_topic` - ADD COLUMN `topic_type` smallint(3) NOT NULL DEFAULT 1 COMMENT 'EnumWxTopicType' AFTER `parent_tenant_id`; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V2021120900001__add_type.sql b/mallinkAdmin/src/main/resources/db/migration/V2021120900001__add_type.sql new file mode 100644 index 000000000..00086ceed --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2021120900001__add_type.sql @@ -0,0 +1,6 @@ +ALTER TABLE `mallink`.`wx_topic` +ADD COLUMN `topic_type` smallint(3) NOT NULL DEFAULT 1 COMMENT 'EnumWxTopicType' AFTER `parent_tenant_id`; + + +ALTER TABLE `mallink`.`wx_appinfo` +ADD COLUMN `mould_type` smallint(2) NOT NULL DEFAULT 0 COMMENT '模板类型' AFTER `type`; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java index f930b145b..44b5d9a44 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java @@ -38,6 +38,8 @@ public class WxAppinfo extends BaseTenantEntity { private Long payId; @io.swagger.annotations.ApiModelProperty(value="1B端2C端",name="type") private Integer type; + @io.swagger.annotations.ApiModelProperty(value="模板类型",name="mouldType") + private Integer mouldType; @io.swagger.annotations.ApiModelProperty(value="支付ID,参看wx_pay_account_bill",name="payBillId") private Long payBillId; @io.swagger.annotations.ApiModelProperty(value="是否启用(0:启用,1禁用)",name="enable") diff --git a/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml b/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml index 02cc8b2d6..bb577d7eb 100644 --- a/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml @@ -16,6 +16,7 @@ + @@ -25,7 +26,7 @@ `id`,`tenant_id`,`app_id`,`parent_app_id`,`name`, `secret`,`token`,`aes_key`,`msg_data_format`,`access_token`,`last_token_time`,`expires_in`, - `pay_id`,`type`,`pay_bill_id`,`plat` + `pay_id`,`type`,`mould_type`,`pay_bill_id`,`plat`