Commit 29d302a90160895d246c58b9cab5d9803999ac64

Authored by huangyemin
1 parent ba206052

sql脚本执行报错问题修改

sql/optional/mall/coupon.sql
@@ -20,10 +20,10 @@ CREATE TABLE `coupon` @@ -20,10 +20,10 @@ CREATE TABLE `coupon`
20 `whether_noticed` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否已提醒', 20 `whether_noticed` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否已提醒',
21 `state` tinyint(4) UNSIGNED NOT NULL DEFAULT 0 COMMENT '优惠券状态 1已领用(未使用) 2已使用 3已过期', 21 `state` tinyint(4) UNSIGNED NOT NULL DEFAULT 0 COMMENT '优惠券状态 1已领用(未使用) 2已使用 3已过期',
22 `get_type` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '获取方式1订单2.直接领取3.活动领取 4转赠 5分享获取', 22 `get_type` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '获取方式1订单2.直接领取3.活动领取 4转赠 5分享获取',
23 - `fetch_time` datetime NOT NULL DEFAULT 0 COMMENT '领取时间',  
24 - `use_time` datetime NOT NULL DEFAULT 0 COMMENT '使用时间',  
25 - `start_time` datetime NOT NULL DEFAULT 0 COMMENT '可使用的开始时间',  
26 - `end_time` datetime NOT NULL DEFAULT 0 COMMENT '有效期结束时间', 23 + `fetch_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '领取时间',
  24 + `use_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '使用时间',
  25 + `start_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '可使用的开始时间',
  26 + `end_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '有效期结束时间',
27 `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者', 27 `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
28 `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', 28 `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
29 `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者', 29 `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
sql/optional/mall/mall.sql
@@ -23,18 +23,18 @@ SET FOREIGN_KEY_CHECKS = 0; @@ -23,18 +23,18 @@ SET FOREIGN_KEY_CHECKS = 0;
23 DROP TABLE IF EXISTS `market_activity`; 23 DROP TABLE IF EXISTS `market_activity`;
24 CREATE TABLE `market_activity` ( 24 CREATE TABLE `market_activity` (
25 `id` bigint NOT NULL AUTO_INCREMENT COMMENT '活动编号', 25 `id` bigint NOT NULL AUTO_INCREMENT COMMENT '活动编号',
26 - `title` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '' COMMENT '活动标题', 26 + `title` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '活动标题',
27 `activity_type` tinyint NOT NULL COMMENT '活动类型', 27 `activity_type` tinyint NOT NULL COMMENT '活动类型',
28 `status` tinyint NOT NULL DEFAULT -1 COMMENT '活动状态', 28 `status` tinyint NOT NULL DEFAULT -1 COMMENT '活动状态',
29 `start_time` datetime NOT NULL COMMENT '开始时间', 29 `start_time` datetime NOT NULL COMMENT '开始时间',
30 `end_time` datetime NOT NULL COMMENT '结束时间', 30 `end_time` datetime NOT NULL COMMENT '结束时间',
31 `invalid_time` datetime NULL DEFAULT NULL COMMENT '失效时间', 31 `invalid_time` datetime NULL DEFAULT NULL COMMENT '失效时间',
32 `delete_time` datetime NULL DEFAULT NULL COMMENT '删除时间', 32 `delete_time` datetime NULL DEFAULT NULL COMMENT '删除时间',
33 - `time_limited_discount` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '限制折扣字符串,使用 JSON 序列化成字符串存储',  
34 - `full_privilege` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '限制折扣字符串,使用 JSON 序列化成字符串存储',  
35 - `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '创建者', 33 + `time_limited_discount` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '限制折扣字符串,使用 JSON 序列化成字符串存储',
  34 + `full_privilege` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '限制折扣字符串,使用 JSON 序列化成字符串存储',
  35 + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
36 `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', 36 `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
37 - `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '更新者', 37 + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
38 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', 38 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
39 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', 39 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
40 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', 40 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
@@ -53,18 +53,18 @@ COMMIT; @@ -53,18 +53,18 @@ COMMIT;
53 DROP TABLE IF EXISTS `market_banner`; 53 DROP TABLE IF EXISTS `market_banner`;
54 CREATE TABLE `market_banner` ( 54 CREATE TABLE `market_banner` (
55 `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'Banner编号', 55 `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'Banner编号',
56 - `title` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '' COMMENT 'Banner标题',  
57 - `pic_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '图片URL', 56 + `title` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT 'Banner标题',
  57 + `pic_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '图片URL',
58 `status` tinyint NOT NULL DEFAULT -1 COMMENT '活动状态', 58 `status` tinyint NOT NULL DEFAULT -1 COMMENT '活动状态',
59 - `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '跳转地址',  
60 - `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '创建者', 59 + `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '跳转地址',
  60 + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
61 `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', 61 `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
62 - `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '' COMMENT '更新者', 62 + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
63 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', 63 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
64 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', 64 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
65 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', 65 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
66 `sort` tinyint NULL DEFAULT NULL COMMENT '排序', 66 `sort` tinyint NULL DEFAULT NULL COMMENT '排序',
67 - `memo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '描述', 67 + `memo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '描述',
68 PRIMARY KEY (`id`) USING BTREE 68 PRIMARY KEY (`id`) USING BTREE
69 ) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'Banner管理'; 69 ) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'Banner管理';
70 70
@@ -81,11 +81,11 @@ DROP TABLE IF EXISTS `member_address`; @@ -81,11 +81,11 @@ DROP TABLE IF EXISTS `member_address`;
81 CREATE TABLE `member_address` ( 81 CREATE TABLE `member_address` (
82 `id` bigint NOT NULL AUTO_INCREMENT COMMENT '收件地址编号', 82 `id` bigint NOT NULL AUTO_INCREMENT COMMENT '收件地址编号',
83 `user_id` bigint NOT NULL COMMENT '用户编号', 83 `user_id` bigint NOT NULL COMMENT '用户编号',
84 - `name` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '收件人名称',  
85 - `mobile` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '手机号', 84 + `name` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '收件人名称',
  85 + `mobile` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '手机号',
86 `area_id` bigint NOT NULL COMMENT '地区编码', 86 `area_id` bigint NOT NULL COMMENT '地区编码',
87 - `post_code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '邮编',  
88 - `detail_address` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '收件详细地址', 87 + `post_code` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '邮编',
  88 + `detail_address` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '收件详细地址',
89 `defaulted` bit(1) NOT NULL COMMENT '是否默认', 89 `defaulted` bit(1) NOT NULL COMMENT '是否默认',
90 `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者', 90 `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
91 `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', 91 `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
@@ -95,7 +95,7 @@ CREATE TABLE `member_address` ( @@ -95,7 +95,7 @@ CREATE TABLE `member_address` (
95 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', 95 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
96 PRIMARY KEY (`id`) USING BTREE, 96 PRIMARY KEY (`id`) USING BTREE,
97 INDEX `idx_userId`(`user_id` ASC) USING BTREE 97 INDEX `idx_userId`(`user_id` ASC) USING BTREE
98 -) ENGINE = InnoDB AUTO_INCREMENT = 21 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '用户收件地址'; 98 +) ENGINE = InnoDB AUTO_INCREMENT = 21 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户收件地址';
99 99
100 -- ---------------------------- 100 -- ----------------------------
101 -- Records of member_address 101 -- Records of member_address