diff --git a/mallinkAdmin/src/main/resources/db/migration/V202107280001__addmall_pwemission.sql b/mallinkAdmin/src/main/resources/db/migration/V202107280001__addmall_pwemission.sql index 0b5cdc136..9346ea500 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202107280001__addmall_pwemission.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202107280001__addmall_pwemission.sql @@ -2,14 +2,14 @@ INSERT INTO `mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (109, '地图看板', 1, 'Y', NULL, 1, NULL, NULL, 'mapban', 'icon-shuju', 0, 102); --销售类型加权限 -update 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, 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, 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, 614, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 664, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 686, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 901, 902, 903, 904, 905, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 60701, 60702]' where id=1; - +-- update 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, 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, 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, 614, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 664, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 686, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 901, 902, 903, 904, 905, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 60701, 60702]' where id=1; +--金茂专用 --加金茂合同菜单 INSERT INTO `mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (307, '金茂合同', 299, 'Y', NULL, 1, NULL, NULL, 'jmrentlist', 'icon-zhangdan', 0, 307); INSERT INTO `mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (308, '金茂合同', 300, 'Y', NULL, 1, NULL, NULL, 'jmpointrentlist', 'icon-wuyehetong', 0, 308); - - --销售类型加权限 -update 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, 251, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 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, 614, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 664, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 686, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 901, 902, 903, 904, 905, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 60701, 60702]' where id=1; +--update 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, 251, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 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, 614, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 664, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 686, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 901, 902, 903, 904, 905, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 60701, 60702]' where id=1; +--金茂专用 +INSERT INTO `mallink`.`mall_sale_type`(`id`, `name`, `type`, `period`, `menus`) VALUES (1035001036, '金茂专用', 99, 12, '[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, 251, 299, 300, 307, 308, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 421, 422, 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, 614, 621, 622, 623, 624, 625, 626, 627, 641, 642, 643, 644, 645, 646, 651, 661, 662, 663, 664, 671, 672, 673, 674, 675, 681, 682, 683, 684, 685, 686, 691, 692, 693, 694, 695, 701, 702, 703, 704, 711, 712, 713, 901, 902, 903, 904, 905, 931, 932, 951, 952, 961, 962, 963, 965, 966, 967, 968, 1001, 1002, 1003, 1004, 60701, 60702]'); diff --git a/mallinkAdmin/src/main/resources/db/migration/V202108100001__addwx_rent_contract.sql b/mallinkAdmin/src/main/resources/db/migration/V202108100001__addwx_rent_contract.sql index 12c7755dc..2d6275347 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202108100001__addwx_rent_contract.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202108100001__addwx_rent_contract.sql @@ -3,17 +3,14 @@ ADD COLUMN `social_credit_code` varchar(255) COMMENT '甲方统一社会信用 ADD COLUMN `bank_name` varchar(255) COMMENT '甲方开户行' AFTER `social_credit_code`; - - - ALTER TABLE `mallink`.`wx_rent_contract` ADD COLUMN `shop_type_sub` varchar(255) COMMENT '商品类别' AFTER `merchant_id`, -ADD COLUMN `lease_purpose` varchar(255) COMMENT '租赁用途' AFTER `shopTypeSub`, +ADD COLUMN `lease_purpose` varchar(255) COMMENT '租赁用途' AFTER `shop_type_sub`, ADD COLUMN `contractual_rules` json COMMENT '{total:3,partyA:2,partyB:1}' AFTER `lease_purpose`, ADD COLUMN `delivery_date` datetime(0) COMMENT '交付日期' AFTER `contractual_rules`, ADD COLUMN `delivery_grace_period` int(11) COMMENT '交付宽限期(天)' AFTER `delivery_date`, ADD COLUMN `opening_date` datetime(0) COMMENT '开业日期' AFTER `delivery_grace_period`, -ADD COLUMN `business_hours` json COMMENT '营业时间{start:,end:}' AFTER `opening_date`; +ADD COLUMN `business_hours` json COMMENT '营业时间{start:,end:}' AFTER `opening_date`, ADD COLUMN `scope_metre` int(11) COMMENT '合同期内?米不得新设相同品牌之分店或加盟店' AFTER `business_hours`; @@ -25,7 +22,7 @@ ADD COLUMN `second_party_bank_info` json COMMENT '乙方银行帐号信息' AFTE ADD COLUMN `second_party_tax_info` json COMMENT '乙方税务信息' AFTER `second_party_bank_info`; ALTER TABLE `mallink`.`wx_rent_contract` -ADD COLUMN `property_name` varchar(255) COMMENT '物业公司名称' AFTER `account_num_a`, +ADD COLUMN `property_name` varchar(255) COMMENT '物业公司名称' AFTER `second_party_tax_info`, ADD COLUMN `property_fee` int(11) COMMENT '物业费金额' AFTER `property_name`, ADD COLUMN `fee_cycle` tinyint(1) COMMENT '物业费支付周期(月/季/年)' AFTER `property_fee`, ADD COLUMN `water_fee` int(11) COMMENT '水费(分/吨)' AFTER `fee_cycle`, diff --git a/mallinkAdmin/src/main/resources/db/migration/V202108190004__add_jm_sport_order.sql b/mallinkAdmin/src/main/resources/db/migration/V202108190004__add_jm_sport_order.sql index c4131a6f4..f6ef9260e 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202108190004__add_jm_sport_order.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202108190004__add_jm_sport_order.sql @@ -23,7 +23,7 @@ SET FOREIGN_KEY_CHECKS = 0; DROP TABLE IF EXISTS `jm_sport_order`; CREATE TABLE `jm_sport_order` ( `id` bigint(20) NOT NULL COMMENT '主键ID', - `order_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, + `order_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL, `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID', `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '父租户ID', `user_phone` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL, @@ -41,6 +41,6 @@ CREATE TABLE `jm_sport_order` ( UNIQUE INDEX `id_UNIQUE`(`id`) USING BTREE, UNIQUE INDEX `order_id`(`order_id`) USING BTREE, INDEX `idx_user`(`user_id`) USING BTREE COMMENT '订单索引-用户' -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '订单正反向交易各产生一个单独订单,用order_number保持正反向交易一致。' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '订单。' ROW_FORMAT = Dynamic; SET FOREIGN_KEY_CHECKS = 1;