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" > -