From 5ba2a087c8840fe1bf1ca77f7677620efa8f9df7 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 24 Feb 2023 14:15:34 +0800 Subject: [PATCH 1/3] //mallcoo --- .../V2023022300001__add_goodsC_permission.sql | 2 +- .../V2023022400001__upd_mall_coo.sql | 606 ++++++++++++++++++ .../config/BaseMyBatisConfiguration.java | 2 +- .../iformall/domain/po/MallCooUserInfo.java | 29 +- .../mapper/MallCooUserInfoMapper.java | 2 +- .../service/WxCUserBasicInfoService.java | 2 +- .../impl/MallCooUserInfoServiceImpl.java | 12 +- .../impl/WxCUserBasicInfoServiceImpl.java | 21 +- ...FmInsideBasicUserTenantMsgServiceImpl.java | 2 +- .../mapper/MallCooUserInfoMapper.xml | 7 +- 10 files changed, 636 insertions(+), 49 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V2023022400001__upd_mall_coo.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023022300001__add_goodsC_permission.sql b/mallinkAdmin/src/main/resources/db/migration/V2023022300001__add_goodsC_permission.sql index 93b5dd2fb..fc16ea032 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V2023022300001__add_goodsC_permission.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V2023022300001__add_goodsC_permission.sql @@ -3,7 +3,7 @@ INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, -INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (652, '消费卡', 603, 'Y', NULL, 1, NULL, NULL, 'introducingSearch', NULL, 0, 652); +INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (652, '消费卡检索', 603, 'Y', NULL, 1, NULL, NULL, 'introducingSearch', NULL, 0, 652); UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 50, 101, 102, 103, 104, 105, 106, 107, 108, 109, 201, 202, 203, 204, 205, 206, 209, 211, 212, 221, 222, 224, 225, 251, 299, 300, 301, 302, 303, 304, 305, 306, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 431, 432, 501, 502, 503, 504, 505, 506, 507, 508, 509, 511, 512, 513, 514, 521, 522, 523, 531, 532, 533, 591, 592, 595, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 652, 661, 662, 663, 664, 665, 666, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 687, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 714, 715, 901, 902, 903, 904, 905, 906, 907, 908, 910, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 6611, 60701, 60702]' WHERE `id` = 1; diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023022400001__upd_mall_coo.sql b/mallinkAdmin/src/main/resources/db/migration/V2023022400001__upd_mall_coo.sql new file mode 100644 index 000000000..f076b7e1a --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2023022400001__upd_mall_coo.sql @@ -0,0 +1,606 @@ +UPDATE `mallink`.`mall_coo_user_info_0` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_1` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_2` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_3` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_4` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_5` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_6` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_7` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_8` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_9` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_10` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_11` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_12` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_13` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_14` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_15` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_16` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_17` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_18` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_19` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_20` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_21` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_22` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_23` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_24` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_25` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_26` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_27` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_28` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_29` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_30` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_31` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_32` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_33` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_34` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_35` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_36` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_37` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_38` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_39` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_40` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_41` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_42` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_43` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_44` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_45` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_46` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_47` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_48` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_49` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_50` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_51` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_52` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_53` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_54` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_55` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_56` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_57` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_58` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_59` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_60` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_61` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_62` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_63` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_64` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_65` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_66` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_67` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_68` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_69` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_70` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_71` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_72` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_73` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_74` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_75` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_76` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_77` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_78` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_79` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_80` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_81` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_82` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_83` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_84` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_85` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_86` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_87` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_88` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_89` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_90` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_91` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_92` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_93` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_94` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_95` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_96` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_97` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_98` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; +UPDATE `mallink`.`mall_coo_user_info_99` SET `tenant_id` = `final_tenant_id` WHERE `final_tenant_id` is not null; + + + + + + +ALTER TABLE `mallink`.`mall_coo_user_info_0` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_1` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_2` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_3` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_4` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_5` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_6` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_7` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_8` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_9` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_10` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_11` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_12` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_13` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_14` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_15` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_16` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_17` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_18` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_19` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_20` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_21` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_22` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_23` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_24` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_25` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_26` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_27` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_28` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_29` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_30` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_31` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_32` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_33` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_34` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_35` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_36` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_37` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_38` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_39` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_40` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_41` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_42` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_43` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_44` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_45` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_46` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_47` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_48` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_49` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_50` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_51` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_52` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_53` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_54` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_55` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_56` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_57` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_58` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_59` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_60` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_61` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_62` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_63` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_64` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_65` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_66` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_67` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_68` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_69` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_70` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_71` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_72` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_73` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_74` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_75` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_76` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_77` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_78` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_79` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_80` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_81` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_82` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_83` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_84` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_85` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_86` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_87` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_88` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_89` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_90` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_91` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_92` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_93` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_94` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_95` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_96` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_97` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_98` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; +ALTER TABLE `mallink`.`mall_coo_user_info_99` +DROP COLUMN `final_tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`, +DROP INDEX `phone_UNIQUE`, +ADD UNIQUE INDEX `phone_UNIQUE`(`phone`, `tenant_id`) USING BTREE; diff --git a/mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java b/mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java index 8b80c8a86..4faf77d3c 100644 --- a/mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java +++ b/mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java @@ -111,7 +111,7 @@ public class BaseMyBatisConfiguration { shardingList.add(basicInfoAddressSharding); ShardingSphere mallCooUserInfoSharding = new ShardingSphere(); - mallCooUserInfoSharding.setColumn("final_tenant_id"); + mallCooUserInfoSharding.setColumn("tenant_id"); mallCooUserInfoSharding.setTableName("mall_coo_user_info"); mallCooUserInfoSharding.setCount(100); mallCooUserInfoSharding.setRule(EnumShardingRule.HASH.getCode()); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallCooUserInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/MallCooUserInfo.java index 5c50d2a6e..aa724c13f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallCooUserInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallCooUserInfo.java @@ -16,24 +16,10 @@ import java.util.Date; @Data @ToString(callSuper = true) @EqualsAndHashCode(callSuper = true) -public class MallCooUserInfo extends TenantEntityWithoutFinalTenantId { +public class MallCooUserInfo extends TenantEntity { protected Long id; - @io.swagger.annotations.ApiModelProperty(value="如果是集团版的,存集团版的tenantId,如果是商场,则存商场",name="sex") - private String finalTenantId; - - @JsonIgnore - @TableField(exist = false) - protected String shardFinalTableSuffix; - - public String getShardFinalTableSuffix(){ - if(StringUtils.isNotBlank(finalTenantId)){ - shardFinalTableSuffix = "_" + Integer.parseInt(finalTenantId)%100; - } - return shardFinalTableSuffix; - } - @io.swagger.annotations.ApiModelProperty(value="猫酷用户ID",name="openUserId") private String openUserId; @@ -58,19 +44,6 @@ public class MallCooUserInfo extends TenantEntityWithoutFinalTenantId { @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; - public void undateFinalTenantId(TenantEntity tenantEntity){ -// setTenantId(tenantEntity.getTenantId()); -// setParentTenantId(tenantEntity.getParentTenantId()); - setFinalTenantId(tenantEntity.getTenantId()); - if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ - setFinalTenantId(tenantEntity.getParentTenantId()); - } - - if(!tenantEntity.getTenantId().equals(getFinalTenantId())){ - setTenantId(tenantEntity.getTenantId()); - } - } - @TableField(exist = false) private Date startTime; diff --git a/mallinkService/src/main/java/com/iformall/mapper/MallCooUserInfoMapper.java b/mallinkService/src/main/java/com/iformall/mapper/MallCooUserInfoMapper.java index d6a4c3a05..ff4014016 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/MallCooUserInfoMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/MallCooUserInfoMapper.java @@ -11,7 +11,7 @@ public interface MallCooUserInfoMapper extends CommonMapper findList(MallCooUserInfo mallCooUserInfo); - MallCooUserInfo selectById(@Param("id")Long id,@Param("finalTenantId")String finalTenantId); + MallCooUserInfo selectById(@Param("id")Long id,@Param("tenantId")String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java index 2dbc57002..b51539a38 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java @@ -178,6 +178,6 @@ public interface WxCUserBasicInfoService { void updateTenantIdMsg(TenantEntity tenantInfo, TenantEntity mallTenant, Long userId); - void updateTenantId(String finalTenantId, String tenantId, Long userId); + void updateTenantId(TenantEntity tenantInfo, Long userId); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallCooUserInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallCooUserInfoServiceImpl.java index 6e9a1859d..8e2513486 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallCooUserInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallCooUserInfoServiceImpl.java @@ -45,14 +45,14 @@ public class MallCooUserInfoServiceImpl implements MallCooUserInfoService { @Override - public MallCooUserInfo getById(Long id,String finalTenantId) { - return mallCooUserInfoMapper.selectById(id,finalTenantId); + public MallCooUserInfo getById(Long id,String tenantId) { + return mallCooUserInfoMapper.selectById(id,tenantId); } @Override - public MallCooUserInfo getByPhone(String phone, String finalTenantId) { + public MallCooUserInfo getByPhone(String phone, String tenantId) { MallCooUserInfo userInfo = new MallCooUserInfo(); - userInfo.setFinalTenantId(finalTenantId); + userInfo.setTenantId(tenantId); userInfo.setPhone(phone); return mallCooUserInfoMapper.selectOne(new QueryWrapper<>(userInfo)); } @@ -70,14 +70,14 @@ public class MallCooUserInfoServiceImpl implements MallCooUserInfoService { logger.error("未找到会员信息"+basicUserId); return; } - MallCooUserInfo mallCooUserInfo = this.getByPhone(basicInfo.getPhone(), basicInfo.getFinalTenantId()); + MallCooUserInfo mallCooUserInfo = this.getByPhone(basicInfo.getPhone(), tenantEntity.getTenantId()); if(mallCooUserInfo == null){ String openUserID = MallcooHelper.openByMobile(config, basicInfo.getPhone(), null); if(StringUtils.isNotBlank(openUserID)){ Date now = new Date(); mallCooUserInfo = new MallCooUserInfo(); mallCooUserInfo.setId(basicInfo.getId()); - mallCooUserInfo.setFinalTenantId(basicInfo.getFinalTenantId()); + mallCooUserInfo.updateTenantInfo(tenantEntity); mallCooUserInfo.setOpenUserId(openUserID); mallCooUserInfo.setPhone(basicInfo.getPhone()); mallCooUserInfo.setCreateDate(now); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index 5b87c23e6..a6b006058 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -97,6 +97,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc @Autowired WxMallService wxMallService; + @Autowired + MallCooUserInfoService mallCooUserInfoService; + @Autowired private MqBaseProducer mqBaseProducer; @@ -752,14 +755,20 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc } @Override - public void updateTenantId(String finalTenantId, String tenantId, Long userId) { - WxCUserBasicInfo basicInfo = this.getById(userId, finalTenantId); - if(basicInfo != null && !basicInfo.getTenantId().contains("," + tenantId + ",")){ + public void updateTenantId(TenantEntity tenantEntity, Long userId) { + WxCUserBasicInfo basicInfo = this.getById(userId, tenantEntity.getFinalTenantId()); + if(basicInfo != null && !basicInfo.getTenantId().contains("," + tenantEntity.getTenantId() + ",")){ WxCUserBasicInfo basicInfoUpd = new WxCUserBasicInfo(); - basicInfoUpd.setFinalTenantId(finalTenantId); + basicInfoUpd.setFinalTenantId(tenantEntity.getFinalTenantId()); basicInfoUpd.setId(userId); - basicInfoUpd.setTenantId(basicInfo.getTenantId() + tenantId + ","); - wxCUserBasicInfoMapper.updateById(basicInfoUpd); + basicInfoUpd.setTenantId(basicInfo.getTenantId() + tenantEntity.getTenantId() + ","); + int i = wxCUserBasicInfoMapper.updateById(basicInfoUpd); + try{ + //推送猫酷 + mallCooUserInfoService.pullByMobileMsg(tenantEntity, basicInfo.getId()); + }catch(Exception e){ + logger.error("发送同步会员消息异常"); + } } } diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideBasicUserTenantMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideBasicUserTenantMsgServiceImpl.java index 22519dba1..10c5b9b2d 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideBasicUserTenantMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideBasicUserTenantMsgServiceImpl.java @@ -27,7 +27,7 @@ public class FmInsideBasicUserTenantMsgServiceImpl implements MsgSendService { public void send(BaseMsg baseMsg) throws Exception{ FmInsideBasicUserPushMsg msg = (FmInsideBasicUserPushMsg)baseMsg; - wxCUserBasicInfoService.updateTenantId(msg.getFinalTenantId(),msg.getMallTenantEntity().getTenantId(),msg.getBasicUserId()); + wxCUserBasicInfoService.updateTenantId(msg.getMallTenantEntity(),msg.getBasicUserId()); } } diff --git a/mallinkService/src/main/resources/mapper/MallCooUserInfoMapper.xml b/mallinkService/src/main/resources/mapper/MallCooUserInfoMapper.xml index 2f62937d6..6558ad94d 100644 --- a/mallinkService/src/main/resources/mapper/MallCooUserInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallCooUserInfoMapper.xml @@ -12,18 +12,17 @@ - `id`,`open_user_id`,`phone`,`birthdate`,`gender`, `address`,`create_date`,`update_date`, - `final_tenant_id`,`tenant_id`,`parent_tenant_id`,`user_name` + `tenant_id`,`parent_tenant_id`,`user_name` - where `final_tenant_id` = #{finalTenantId} + where `tenant_id` = #{tenantId} and `id` = #{id} @@ -68,7 +67,7 @@ select from mall_coo_user_info where id =#{id} - and final_tenant_id = #{finalTenantId} + and tenant_id = #{tenantId} From 47c852f11b5c319be1214a82009a8e348ce13357 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 24 Feb 2023 14:48:59 +0800 Subject: [PATCH 2/3] //sharing --- .../domain/vo/WxProfitSharingOrderDetailsVo.java | 10 +++++----- .../resources/mapper/WxProfitSharingOrderMapper.xml | 10 +--------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderDetailsVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderDetailsVo.java index ee5689246..c0e9f5797 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderDetailsVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxProfitSharingOrderDetailsVo.java @@ -25,14 +25,14 @@ public class WxProfitSharingOrderDetailsVo extends TenantEntity { private String failedReason; private String description; private Long sharingReceiverId; - private Integer receiverType; +// private Integer receiverType; private String receiverAccount; - private String receiverComments; - private Integer sharingType; - private Integer status; +// private String receiverComments; +// private Integer sharingType; +// private Integer status; public String getReceiverAccount(){ - if(sharingReceiverId.equals(0l) && StringUtils.isNotBlank(this.description)){ + if(StringUtils.isNotBlank(this.description)){ JSONObject jsonObject = JSON.parseObject(this.description); if(jsonObject != null){ this.receiverAccount = jsonObject.getString("account"); diff --git a/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml index 5733c25b6..3d3dca716 100644 --- a/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxProfitSharingOrderMapper.xml @@ -271,23 +271,15 @@ - - - - - - From 230b17a59116e8e70b11548e5d80d109faef78b2 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 24 Feb 2023 15:16:10 +0800 Subject: [PATCH 3/3] //mall --- .../migration/V2023022400002__add_mall_default_sign.sql | 2 ++ .../src/main/java/com/iformall/domain/po/WxMall.java | 6 ++++-- mallinkService/src/main/resources/mapper/WxMallMapper.xml | 8 ++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V2023022400002__add_mall_default_sign.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023022400002__add_mall_default_sign.sql b/mallinkAdmin/src/main/resources/db/migration/V2023022400002__add_mall_default_sign.sql new file mode 100644 index 000000000..4b88c3d36 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2023022400002__add_mall_default_sign.sql @@ -0,0 +1,2 @@ +ALTER TABLE `mallink`.`wx_mall` +ADD COLUMN `default_sign` smallint(1) DEFAULT 0 COMMENT '默认标记' AFTER `longitude`; \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java index 78a4f0647..1ba3373d5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java @@ -79,12 +79,14 @@ public class WxMall extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "启用结束时间", name = "validEnd") private Date validEnd; - @io.swagger.annotations.ApiModelProperty(value="集团支持(0:不支持,1支持)",name="groupSupport") - private Integer groupSupport; @io.swagger.annotations.ApiModelProperty(value="经度",name="longitude") private BigDecimal longitude; @io.swagger.annotations.ApiModelProperty(value="纬度",name="latitude") private BigDecimal latitude; + @io.swagger.annotations.ApiModelProperty(value="默认标记(0:,1默认)",name="defaultSign") + private Integer defaultSign; + @io.swagger.annotations.ApiModelProperty(value="集团支持(0:不支持,1支持)",name="groupSupport") + private Integer groupSupport; @io.swagger.annotations.ApiModelProperty(value="直播支持(0:不支持,1支持)",name="liveSupport") private Integer liveSupport; @io.swagger.annotations.ApiModelProperty(value="是否支持商户提现(不开启分账才有效) 0-不支持 1-支持",name="cashOutSupport") diff --git a/mallinkService/src/main/resources/mapper/WxMallMapper.xml b/mallinkService/src/main/resources/mapper/WxMallMapper.xml index cce5879de..c5f0e374d 100644 --- a/mallinkService/src/main/resources/mapper/WxMallMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallMapper.xml @@ -32,10 +32,13 @@ - + + + + @@ -56,7 +59,8 @@ `img_url`,`img_url_h`, `weap_note`, `img_qrcode_weapp`, `img_qrcode_wemp`, `weapp_share_title`,`weapp_share_cover_img`, `pos_qrcode_rule`, `sale_type`, `valid_start`, `valid_end`,`business_hours`,`introduction`,`img`, - `group_support`,`latitude`,`longitude`,`live_support`,`cash_out_support`,`cash_out_limit`,`alipay_app_auth_token`,`alipay_member_template_id` + `latitude`,`longitude`,`default_sign`,`group_support`,`live_support`, + `cash_out_support`,`cash_out_limit`,`alipay_app_auth_token`,`alipay_member_template_id`