Commit 9517ffdfb81c1b1be543a7e6e7ee35bf078c6182

Authored by puhui999
1 parent 331be53b

fix:修复 mall product promotion 测试 sql

yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql
@@ -126,82 +126,32 @@ CREATE TABLE IF NOT EXISTS `product_property_value` ( @@ -126,82 +126,32 @@ CREATE TABLE IF NOT EXISTS `product_property_value` (
126 PRIMARY KEY("id") 126 PRIMARY KEY("id")
127 ) COMMENT '规格值'; 127 ) COMMENT '规格值';
128 128
129 --- TODO @puhui999:格式不太对哈  
130 -CREATE TABLE IF NOT EXISTS `product_comment`  
131 -(  
132 - `id`  
133 - bigint  
134 - NOT  
135 - NULL  
136 - AUTO_INCREMENT  
137 - COMMENT  
138 - '评论编号,主键自增',  
139 - `user_id`  
140 - bigint  
141 - DEFAULT  
142 - NULL  
143 - COMMENT  
144 - '评价人的用户编号关联 MemberUserDO 的 id 编号',  
145 - `user_nickname`  
146 - varchar  
147 -(  
148 - 255  
149 -) DEFAULT NULL COMMENT '评价人名称',  
150 - `user_avatar` varchar  
151 -(  
152 - 1024  
153 -) DEFAULT NULL COMMENT '评价人头像',  
154 - `anonymous` bit  
155 -(  
156 - 1  
157 -) DEFAULT NULL COMMENT '是否匿名', 129 +DROP TABLE IF EXISTS `product_comment` (
  130 + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '评论编号,主键自增',
  131 + `user_id` bigint DEFAULT NULL COMMENT '评价人的用户编号关联 MemberUserDO 的 id 编号',
  132 + `user_nickname` varchar(255) DEFAULT NULL COMMENT '评价人名称',
  133 + `user_avatar` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '评价人头像',
  134 + `anonymous` bit(1) DEFAULT NULL COMMENT '是否匿名',
158 `order_id` bigint DEFAULT NULL COMMENT '交易订单编号关联 TradeOrderDO 的 id 编号', 135 `order_id` bigint DEFAULT NULL COMMENT '交易订单编号关联 TradeOrderDO 的 id 编号',
159 `order_item_id` bigint DEFAULT NULL COMMENT '交易订单项编号关联 TradeOrderItemDO 的 id 编号', 136 `order_item_id` bigint DEFAULT NULL COMMENT '交易订单项编号关联 TradeOrderItemDO 的 id 编号',
160 `spu_id` bigint DEFAULT NULL COMMENT '商品 SPU 编号关联 ProductSpuDO 的 id', 137 `spu_id` bigint DEFAULT NULL COMMENT '商品 SPU 编号关联 ProductSpuDO 的 id',
161 - `spu_name` varchar  
162 -(  
163 - 255  
164 -) DEFAULT NULL COMMENT '商品 SPU 名称', 138 + `spu_name` varchar(255) DEFAULT NULL COMMENT '商品 SPU 名称',
165 `sku_id` bigint DEFAULT NULL COMMENT '商品 SKU 编号关联 ProductSkuDO 的 id 编号', 139 `sku_id` bigint DEFAULT NULL COMMENT '商品 SKU 编号关联 ProductSkuDO 的 id 编号',
166 - `visible` bit  
167 -(  
168 - 1  
169 -) DEFAULT NULL COMMENT '是否可见true:显示false:隐藏',  
170 - `scores` tinyint DEFAULT NULL COMMENT '评分星级1-5 分', 140 + `visible` bit(1) DEFAULT NULL COMMENT '是否可见true:显示false:隐藏',
  141 + `scores` tinyint DEFAULT NULL COMMENT '评分星级1-5分',
171 `description_scores` tinyint DEFAULT NULL COMMENT '描述星级1-5 星', 142 `description_scores` tinyint DEFAULT NULL COMMENT '描述星级1-5 星',
172 `benefit_scores` tinyint DEFAULT NULL COMMENT '服务星级1-5 星', 143 `benefit_scores` tinyint DEFAULT NULL COMMENT '服务星级1-5 星',
173 - `content` varchar  
174 -(  
175 - 1024  
176 -) DEFAULT NULL COMMENT '评论内容',  
177 - `pic_urls` varchar  
178 -(  
179 - 4096  
180 -) DEFAULT NULL COMMENT '评论图片地址数组',  
181 - `reply_status` bit  
182 -(  
183 - 1  
184 -) DEFAULT NULL COMMENT '商家是否回复', 144 + `content` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '评论内容',
  145 + `pic_urls` varchar(4096) DEFAULT NULL COMMENT '评论图片地址数组',
  146 + `reply_status` bit(1) DEFAULT NULL COMMENT '商家是否回复',
185 `reply_user_id` bigint DEFAULT NULL COMMENT '回复管理员编号关联 AdminUserDO 的 id 编号', 147 `reply_user_id` bigint DEFAULT NULL COMMENT '回复管理员编号关联 AdminUserDO 的 id 编号',
186 - `reply_content` varchar  
187 -(  
188 - 1024  
189 -) DEFAULT NULL COMMENT '商家回复内容', 148 + `reply_content` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '商家回复内容',
190 `reply_time` datetime DEFAULT NULL COMMENT '商家回复时间', 149 `reply_time` datetime DEFAULT NULL COMMENT '商家回复时间',
191 - `creator` varchar  
192 -(  
193 - 64  
194 -) DEFAULT '' COMMENT '创建者', 150 + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者',
195 `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', 151 `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
196 - `updater` varchar  
197 -(  
198 - 64  
199 -) DEFAULT '' COMMENT '更新者', 152 + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者',
200 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', 153 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
201 - "deleted" bit NOT NULL DEFAULT FALSE,  
202 - "tenant_id" bigint not null default '0',  
203 - PRIMARY KEY  
204 -(  
205 - `id`  
206 -)  
207 - ) COMMENT '产品评论表'; 154 + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
  155 + `tenant_id` bigint NOT NULL DEFAULT '0' COMMENT '租户编号',
  156 + PRIMARY KEY (`id`) USING BTREE
  157 +) ENGINE = InnoDB AUTO_INCREMENT = 26 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '商品评论';
208 \ No newline at end of file 158 \ No newline at end of file
yudao-module-mall/yudao-module-promotion-biz/src/test/resources/sql/clean.sql
1 -DELETE  
2 -FROM "market_activity";  
3 -DELETE  
4 -FROM "promotion_coupon_template";  
5 -DELETE  
6 -FROM "promotion_coupon";  
7 -DELETE  
8 -FROM "promotion_reward_activity";  
9 -DELETE  
10 -FROM "promotion_discount_activity";  
11 -DELETE  
12 -FROM "promotion_discount_product";  
13 -DELETE  
14 -FROM "promotion_seckill_config"; 1 +DELETE FROM "market_activity";
  2 +DELETE FROM "promotion_coupon_template";
  3 +DELETE FROM "promotion_coupon";
  4 +DELETE FROM "promotion_reward_activity";
  5 +DELETE FROM "promotion_discount_activity";
  6 +DELETE FROM "promotion_discount_product";
  7 +DELETE FROM "promotion_seckill_config";
yudao-module-mall/yudao-module-promotion-biz/src/test/resources/sql/create_tables.sql
@@ -107,123 +107,45 @@ CREATE TABLE IF NOT EXISTS "promotion_discount_activity" ( @@ -107,123 +107,45 @@ CREATE TABLE IF NOT EXISTS "promotion_discount_activity" (
107 PRIMARY KEY ("id") 107 PRIMARY KEY ("id")
108 ) COMMENT '限时折扣活动'; 108 ) COMMENT '限时折扣活动';
109 109
110 -CREATE TABLE IF NOT EXISTS "promotion_discount_product" (  
111 - "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,  
112 - "activity_id" bigint NOT NULL,  
113 - "spu_id" bigint NOT NULL,  
114 - "sku_id" bigint NOT NULL,  
115 - "discount_type" int NOT NULL,  
116 - "discount_percent"  
117 - int,  
118 - "discount_price"  
119 - int,  
120 - "creator"  
121 - varchar  
122 - DEFAULT  
123 - '',  
124 - "create_time"  
125 - datetime  
126 - NOT  
127 - NULL  
128 - DEFAULT  
129 - CURRENT_TIMESTAMP,  
130 - "updater"  
131 - varchar  
132 - DEFAULT  
133 - '',  
134 - "update_time"  
135 - datetime  
136 - NOT  
137 - NULL  
138 - DEFAULT  
139 - CURRENT_TIMESTAMP  
140 - ON  
141 - UPDATE  
142 - CURRENT_TIMESTAMP,  
143 - "deleted"  
144 - bit  
145 - NOT  
146 - NULL  
147 - DEFAULT  
148 - FALSE,  
149 - PRIMARY  
150 - KEY  
151 -(  
152 - "id"  
153 -)  
154 - ) COMMENT '限时折扣活动';  
155 -  
156 -CREATE TABLE IF NOT EXISTS "promotion_seckill_config"  
157 -(  
158 - "id"  
159 - bigint  
160 - NOT  
161 - NULL  
162 - GENERATED  
163 - BY  
164 - DEFAULT AS  
165 - IDENTITY,  
166 - "name"  
167 - varchar  
168 - NOT  
169 - NULL,  
170 - "start_time"  
171 - varchar  
172 - NOT  
173 - NULL,  
174 - "end_time"  
175 - varchar  
176 - NOT  
177 - NULL,  
178 - "seckill_activity_count"  
179 - int  
180 - NOT  
181 - NULL,  
182 - "pic_url"  
183 - varchar  
184 - NOT  
185 - NULL,  
186 - "status"  
187 - varchar  
188 - NOT  
189 - NULL,  
190 - "creator"  
191 - varchar  
192 - DEFAULT  
193 - '',  
194 - "create_time"  
195 - datetime  
196 - NOT  
197 - NULL  
198 - DEFAULT  
199 - CURRENT_TIMESTAMP,  
200 - "updater"  
201 - varchar  
202 - DEFAULT  
203 - '',  
204 - "update_time"  
205 - datetime  
206 - NOT  
207 - NULL  
208 - DEFAULT  
209 - CURRENT_TIMESTAMP  
210 - ON  
211 - UPDATE  
212 - CURRENT_TIMESTAMP,  
213 - "deleted"  
214 - bit  
215 - NOT  
216 - NULL  
217 - DEFAULT  
218 - FALSE,  
219 - "tenant_id"  
220 - bigint  
221 - NOT  
222 - NULL,  
223 - PRIMARY  
224 - KEY  
225 -(  
226 - "id"  
227 -)  
228 - ) COMMENT '秒杀时段配置'; 110 +-- 将该建表 SQL 语句,添加到 yudao-module-promotion-biz 模块的 test/resources/sql/create_tables.sql 文件里
  111 +CREATE TABLE IF NOT EXISTS "promotion_seckill_activity" (
  112 + "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
  113 + "spu_id" bigint NOT NULL,
  114 + "name" varchar NOT NULL,
  115 + "status" int NOT NULL,
  116 + "remark" varchar,
  117 + "start_time" varchar NOT NULL,
  118 + "end_time" varchar NOT NULL,
  119 + "sort" int NOT NULL,
  120 + "config_ids" varchar NOT NULL,
  121 + "order_count" int NOT NULL,
  122 + "user_count" int NOT NULL,
  123 + "total_price" int NOT NULL,
  124 + "total_limit_count" int,
  125 + "single_limit_count" int,
  126 + "stock" int,
  127 + "total_stock" int,
  128 + "creator" varchar DEFAULT '',
  129 + "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
  130 + "updater" varchar DEFAULT '',
  131 + "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
  132 + "deleted" bit NOT NULL DEFAULT FALSE,
  133 + "tenant_id" bigint NOT NULL,
  134 + PRIMARY KEY ("id")
  135 +) COMMENT '秒杀活动';
229 136
  137 +CREATE TABLE IF NOT EXISTS "promotion_seckill_config" (
  138 + "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY,
  139 + "name" varchar NOT NULL,
  140 + "start_time" varchar NOT NULL,
  141 + "end_time" varchar NOT NULL,
  142 + "pic_url" varchar NOT NULL,
  143 + "status" int NOT NULL,
  144 + "creator" varchar DEFAULT '',
  145 + "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
  146 + "updater" varchar DEFAULT '',
  147 + "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
  148 + "deleted" bit NOT NULL DEFAULT FALSE,
  149 + "tenant_id" bigint NOT NULL,
  150 + PRIMARY KEY ("id")
  151 +) COMMENT '秒杀时段配置';