From d0cd0ffff9b6d6b3498596d9dea3bbecbd5d6d85 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 20 Oct 2020 11:46:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?denglu=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V202010150001__wxSubscription.sql | 4 ++++ .../iformall/config/BaseMyBatisConfiguration.java | 12 ++++++------ .../main/resources/mapper/WxCouponOrderMapper.xml | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V202010150001__wxSubscription.sql b/mallinkAdmin/src/main/resources/db/migration/V202010150001__wxSubscription.sql index ff8abd35e..0592b31fd 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202010150001__wxSubscription.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202010150001__wxSubscription.sql @@ -14,3 +14,7 @@ left join mall_user_role mur on mui.id = mur.uid where mui.is_admin = 1 and mur.role_id is not null GROUP BY mur.role_id; +ALTER TABLE `mallink`.`wx_template_msg` +ADD COLUMN `on_off` int(255) NOT NULL DEFAULT 0 COMMENT '开关(0/1)' AFTER `update_date`; + + diff --git a/mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java b/mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java index 52600152b..2772f3e5e 100644 --- a/mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java +++ b/mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java @@ -98,12 +98,12 @@ public class BaseMyBatisConfiguration { wxCouponOrderSharding.setRule(EnumShardingRule.HASH.getCode()); shardingList.add(wxCouponOrderSharding); - ShardingSphere wxCouponSendSharding = new ShardingSphere(); - wxCouponSendSharding.setColumn("tenant_id"); - wxCouponSendSharding.setTableName("wx_coupon_send"); - wxCouponSendSharding.setCount(100); - wxCouponSendSharding.setRule(EnumShardingRule.HASH.getCode()); - shardingList.add(wxCouponSendSharding); +// ShardingSphere wxCouponSendSharding = new ShardingSphere(); +// wxCouponSendSharding.setColumn("tenant_id"); +// wxCouponSendSharding.setTableName("wx_coupon_send"); +// wxCouponSendSharding.setCount(100); +// wxCouponSendSharding.setRule(EnumShardingRule.HASH.getCode()); +// shardingList.add(wxCouponSendSharding); ShardingSphere wxOrderGroupSharding = new ShardingSphere(); wxOrderGroupSharding.setColumn("tenant_id"); diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index c83136c6b..eac358bcb 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -1320,7 +1320,7 @@ javaType="java.util.List" select="com.iformall.mapper.WxCouponMerchantMapper.findMerchantVoList" > - From cf8688ba11d265c2e02d412911c18fb4b46ae666 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 20 Oct 2020 16:03:16 +0800 Subject: [PATCH 2/2] bug --- .../src/main/resources/mapper/WxCUserBasicInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 93eb94e19..5c4ba6567 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -1048,6 +1048,6 @@ --> - {call cuser_old_to_new(#{oldCuserId},#{newCuserId})} + {call cuser_old_to_new(#{oldCuserId},#{newCuserId},#{tableIndex})} \ No newline at end of file