From a67b9f84afd26fb307f356e93a391925989dcdd2 Mon Sep 17 00:00:00 2001 From: haoxr <1490493387@qq.com> Date: Mon, 12 Jul 2021 21:20:07 +0800 Subject: [PATCH] =?UTF-8?q?docs(mall=5Fsms.sql):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E8=90=A5=E9=94=80=E6=A8=A1=E5=9D=97=E7=9A=84sql=EF=BC=8C?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E5=B8=83=E9=9A=86=E8=BF=87=E6=BB=A4=E5=99=A8?= =?UTF-8?q?=EF=BC=88=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=BF=9B=E5=85=A5=E5=95=86?= =?UTF-8?q?=E5=93=81=E8=AF=A6=E6=83=85=E6=8A=A5=E9=94=99=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/sql/mall_sms.sql | 147 +++++++++++------- .../interceptor/BloomFilterInterceptor.java | 5 +- 2 files changed, 94 insertions(+), 58 deletions(-) diff --git a/docs/sql/mall_sms.sql b/docs/sql/mall_sms.sql index d49a3fa75..705843e5e 100644 --- a/docs/sql/mall_sms.sql +++ b/docs/sql/mall_sms.sql @@ -11,7 +11,7 @@ Target Server Version : 80023 File Encoding : 65001 - Date: 20/06/2021 00:51:32 + Date: 12/07/2021 21:16:15 */ SET NAMES utf8mb4; @@ -22,52 +22,54 @@ SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- DROP TABLE IF EXISTS `sms_advert`; CREATE TABLE `sms_advert` ( - `id` bigint(0) NOT NULL AUTO_INCREMENT, + `id` bigint NOT NULL AUTO_INCREMENT, `name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '广告名称', `pic` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '图片地址', - `start_time` datetime(0) NULL DEFAULT NULL COMMENT '开始时间', - `end_time` datetime(0) NULL DEFAULT NULL COMMENT '结束时间', + `start_time` datetime NULL DEFAULT NULL COMMENT '开始时间', + `end_time` datetime NULL DEFAULT NULL COMMENT '结束时间', `status` tinyint(1) NOT NULL COMMENT '状态：1-开启 0-关闭', - `sort` int(0) NULL DEFAULT NULL COMMENT '排序', + `sort` int NULL DEFAULT NULL COMMENT '排序', `url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '链接地址', `remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', - `gmt_create` datetime(0) NULL DEFAULT NULL, - `gmt_modified` datetime(0) NULL DEFAULT NULL, + `gmt_create` datetime NULL DEFAULT NULL, + `gmt_modified` datetime NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 9 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '广告表' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 11 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '广告表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of sms_advert -- ---------------------------- -INSERT INTO `sms_advert` VALUES (2, '小程序首页轮播图2', 'http://a.youlai.tech:9000/default/bb9388aa3f374ee69b330b8585ffbae0.png', '2020-10-25 09:25:07', '2023-10-06 00:00:00', 1, 2, NULL, NULL, '2020-10-25 09:25:23', '2021-06-11 07:56:00'); +INSERT INTO `sms_advert` VALUES (2, '小程序首页轮播图2', 'http://a.youlai.tech:9000/default/ff398681c1504e5a83afb877794075dd.jpg', '2020-10-25 09:25:07', '2023-10-06 00:00:00', 1, 2, NULL, NULL, '2020-10-25 09:25:23', '2021-06-11 07:56:00'); INSERT INTO `sms_advert` VALUES (3, '小程序首页轮播图3', 'http://a.youlai.tech:9000/default/dabe64b002704e89a1e0fdfb41e93ddf.jpg', '2020-10-25 09:25:37', '2020-10-31 00:00:00', 1, 3, NULL, NULL, '2020-10-25 09:25:56', '2021-06-11 07:56:23'); INSERT INTO `sms_advert` VALUES (4, '小程序首页轮播图4', 'http://a.youlai.tech:9000/default/e0a32427638943f7a7a69e7cad51263b.jpg', '2020-10-25 00:00:00', '2020-10-31 00:00:00', 1, 4, NULL, NULL, '2020-10-25 09:26:47', '2021-06-11 07:56:49'); INSERT INTO `sms_advert` VALUES (5, '小程序首页轮播图5', 'http://a.youlai.tech:9000/default/1ba8a7f0f832431eae882bb12915276c.jpg', '2020-10-25 00:00:00', '2020-10-31 00:00:00', 1, 5, NULL, NULL, '2020-10-25 10:51:02', '2021-06-11 07:56:41'); +INSERT INTO `sms_advert` VALUES (9, '222', 'http://a.youlai.tech:9000/default/0dca30954b834783a39c5833e9e47daa.jpg', '2021-06-15 00:00:00', '2021-06-22 15:07:32', 1, 5, NULL, '断电', NULL, NULL); +INSERT INTO `sms_advert` VALUES (10, '222', 'http://a.youlai.tech:9000/default/0dca30954b834783a39c5833e9e47daa.jpg', '2021-06-15 00:00:00', '2021-06-22 15:07:32', 1, 5, NULL, '断电', NULL, NULL); -- ---------------------------- -- Table structure for sms_coupon -- ---------------------------- DROP TABLE IF EXISTS `sms_coupon`; CREATE TABLE `sms_coupon` ( - `id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT 'ID', + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', `title` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '优惠券标题（有图片则显示图片）：无门槛50元优惠券 | 单品最高减2000元', `img` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '图片', - `type` int(0) NOT NULL DEFAULT 1 COMMENT '1满减券 2叠加满减券 3无门槛券（需要限制大小）', + `type` int NOT NULL DEFAULT 1 COMMENT '1满减券 2叠加满减券 3无门槛券（需要限制大小）', `publish` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '发布状态, PUBLISH发布，DRAFT草稿，OFFLINE下线', - `condition_price` bigint(0) NOT NULL DEFAULT 0 COMMENT '满多少才可以使用（为0则不限制金额）', - `price` bigint(0) NOT NULL COMMENT '抵扣价格', - `publish_count` int(0) NOT NULL DEFAULT 1 COMMENT '优惠券总量', - `limit_count` int(0) NOT NULL DEFAULT 1 COMMENT '限领张数(默认为1，为0则不限制)', - `take_count` int(0) NOT NULL DEFAULT 0 COMMENT '已领取的优惠券数量', - `used_count` int(0) NOT NULL DEFAULT 0 COMMENT '已使用的优惠券数量', - `start_time` datetime(0) NOT NULL COMMENT '发放开始时间', - `end_time` datetime(0) NOT NULL COMMENT '发放结束时间', - `valid_days` int(0) NOT NULL DEFAULT 1 COMMENT '自领取之日起有效天数', - `status` int(0) NOT NULL DEFAULT 1 COMMENT '逻辑删除使用', - `gmt_create` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `gmt_modified` datetime(0) NULL DEFAULT NULL COMMENT '修改时间', + `condition_price` bigint NOT NULL DEFAULT 0 COMMENT '满多少才可以使用（为0则不限制金额）', + `price` bigint NOT NULL COMMENT '抵扣价格', + `publish_count` int NOT NULL DEFAULT 1 COMMENT '优惠券总量', + `limit_count` int NOT NULL DEFAULT 1 COMMENT '限领张数(默认为1，为0则不限制)', + `take_count` int NOT NULL DEFAULT 0 COMMENT '已领取的优惠券数量', + `used_count` int NOT NULL DEFAULT 0 COMMENT '已使用的优惠券数量', + `start_time` datetime NOT NULL COMMENT '发放开始时间', + `end_time` datetime NOT NULL COMMENT '发放结束时间', + `valid_days` int NOT NULL DEFAULT 1 COMMENT '自领取之日起有效天数', + `status` int NOT NULL DEFAULT 1 COMMENT '逻辑删除使用', + `gmt_create` datetime NULL DEFAULT NULL COMMENT '创建时间', + `gmt_modified` datetime NULL DEFAULT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '优惠券表' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 1372839943053258753 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '优惠券表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of sms_coupon @@ -80,43 +82,72 @@ INSERT INTO `sms_coupon` VALUES (2, '满减优惠券', NULL, 1, 'PUBLISH', 50, 2 -- ---------------------------- DROP TABLE IF EXISTS `sms_coupon_record`; CREATE TABLE `sms_coupon_record` ( - `id` bigint(0) UNSIGNED NOT NULL AUTO_INCREMENT, - `coupon_id` bigint(0) NULL DEFAULT NULL COMMENT '优惠券id', + `id` bigint UNSIGNED NOT NULL AUTO_INCREMENT, + `coupon_id` bigint NULL DEFAULT NULL COMMENT '优惠券id', `use_state` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '使用状态 可用 NEW,已使用USED,过期 EXPIRED;', - `user_id` bigint(0) NULL DEFAULT NULL COMMENT '用户id', + `user_id` bigint NULL DEFAULT NULL COMMENT '用户id', `user_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '用户昵称（冗余字段）', - `coupon_type` int(0) NOT NULL DEFAULT 1 COMMENT '1满减券 2叠加满减券 3无门槛券', + `coupon_type` int NOT NULL DEFAULT 1 COMMENT '1满减券 2叠加满减券 3无门槛券', `coupon_title` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '优惠券标题', - `condition_price` bigint(0) NOT NULL DEFAULT 0 COMMENT '满多少才可以使用（为0则不限制金额）', - `price` bigint(0) NOT NULL COMMENT '抵扣价格', - `start_time` datetime(0) NULL DEFAULT NULL COMMENT '开始时间', - `end_time` datetime(0) NULL DEFAULT NULL COMMENT '结束时间', - `order_id` bigint(0) NULL DEFAULT NULL COMMENT '订单id', - `status` int(0) NOT NULL DEFAULT 1 COMMENT '逻辑删除使用', - `gmt_create` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `gmt_modified` datetime(0) NULL DEFAULT NULL COMMENT '修改时间', + `condition_price` bigint NOT NULL DEFAULT 0 COMMENT '满多少才可以使用（为0则不限制金额）', + `price` bigint NOT NULL COMMENT '抵扣价格', + `start_time` datetime NULL DEFAULT NULL COMMENT '开始时间', + `end_time` datetime NULL DEFAULT NULL COMMENT '结束时间', + `order_id` bigint NULL DEFAULT NULL COMMENT '订单id', + `status` int NOT NULL DEFAULT 1 COMMENT '逻辑删除使用', + `gmt_create` datetime NULL DEFAULT NULL COMMENT '创建时间', + `gmt_modified` datetime NULL DEFAULT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '优惠券领劵使用记录' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 1372841652324487169 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '优惠券领劵使用记录' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of sms_coupon_record -- ---------------------------- INSERT INTO `sms_coupon_record` VALUES (1, 1, 'NEWS', 1, 'zhgsan', 1, '大促销', 50, 20, '2021-03-19 11:12:42', '2021-04-19 11:12:50', NULL, 1, NULL, NULL); +-- ---------------------------- +-- Table structure for sms_coupon_template +-- ---------------------------- +DROP TABLE IF EXISTS `sms_coupon_template`; +CREATE TABLE `sms_coupon_template` ( + `id` bigint NOT NULL COMMENT '主键自增 ID', + `available` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否可用(1:可用;0:不可用)', + `expired` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否过期(1:未过期;0:已过期)', + `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '' COMMENT '优惠券模板名称', + `logo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '' COMMENT '优惠券模板logo', + `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '' COMMENT '优惠券模板描述', + `category` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '' COMMENT '优惠券模板分类', + `product_line` int NOT NULL COMMENT '业务产品线', + `total` int NOT NULL DEFAULT 0 COMMENT '总优惠券数量', + `code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '' COMMENT '优惠券模板编码', + `target` int NOT NULL COMMENT '目标用户', + `rule` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '优惠券规则', + `gmt_create` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP, + `gmt_created_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '', + `gmt_modified` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP, + `gmt_modified_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE INDEX `sms_coupon_template_name_uindex`(`name`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '优惠券模板表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of sms_coupon_template +-- ---------------------------- + -- ---------------------------- -- Table structure for sms_seckill_session -- ---------------------------- DROP TABLE IF EXISTS `sms_seckill_session`; CREATE TABLE `sms_seckill_session` ( - `id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT 'id', + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id', `name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '' COMMENT '场次名称', - `start_time` datetime(0) NULL DEFAULT NULL COMMENT '每日开始时间', - `end_time` datetime(0) NULL DEFAULT NULL COMMENT '每日结束时间', + `start_time` datetime NULL DEFAULT NULL COMMENT '每日开始时间', + `end_time` datetime NULL DEFAULT NULL COMMENT '每日结束时间', `status` tinyint(1) NULL DEFAULT NULL COMMENT '启用状态 1-开启 0-关闭', - `gmt_create` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `gmt_modified` datetime(0) NULL DEFAULT NULL COMMENT '修改时间', + `gmt_create` datetime NULL DEFAULT NULL COMMENT '创建时间', + `gmt_modified` datetime NULL DEFAULT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '秒杀活动场次' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '秒杀活动场次' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of sms_seckill_session @@ -129,17 +160,17 @@ INSERT INTO `sms_seckill_session` VALUES (2, '测试秒杀场次2', '2021-03-07 -- ---------------------------- DROP TABLE IF EXISTS `sms_seckill_sku_relation`; CREATE TABLE `sms_seckill_sku_relation` ( - `id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT 'id', - `session_id` bigint(0) NULL DEFAULT NULL COMMENT '活动场次id', - `sku_id` bigint(0) NULL DEFAULT NULL COMMENT '商品id', - `seckill_price` bigint(0) NOT NULL DEFAULT 0 COMMENT '秒杀价格', - `seckill_count` int(0) NOT NULL DEFAULT 0 COMMENT '秒杀总量', - `seckill_limit` int(0) NOT NULL DEFAULT 0 COMMENT '每人限购数量', - `seckill_sort` int(0) NULL DEFAULT NULL COMMENT '排序', - `gmt_create` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `gmt_modified` datetime(0) NULL DEFAULT NULL COMMENT '修改时间', + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id', + `session_id` bigint NULL DEFAULT NULL COMMENT '活动场次id', + `sku_id` bigint NULL DEFAULT NULL COMMENT '商品id', + `seckill_price` bigint NOT NULL DEFAULT 0 COMMENT '秒杀价格', + `seckill_count` int NOT NULL DEFAULT 0 COMMENT '秒杀总量', + `seckill_limit` int NOT NULL DEFAULT 0 COMMENT '每人限购数量', + `seckill_sort` int NULL DEFAULT NULL COMMENT '排序', + `gmt_create` datetime NULL DEFAULT NULL COMMENT '创建时间', + `gmt_modified` datetime NULL DEFAULT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '秒杀活动商品关联' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '秒杀活动商品关联' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of sms_seckill_sku_relation @@ -153,14 +184,18 @@ INSERT INTO `sms_seckill_sku_relation` VALUES (3, 2, 187, 10, 100, 1, 1, '2021-0 -- ---------------------------- DROP TABLE IF EXISTS `undo_log`; CREATE TABLE `undo_log` ( - `branch_id` bigint(0) NOT NULL COMMENT 'branch transaction id', + `branch_id` bigint NOT NULL COMMENT 'branch transaction id', `xid` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'global transaction id', `context` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT 'undo_log context,such as serialization', `rollback_info` longblob NOT NULL COMMENT 'rollback info', - `log_status` int(0) NOT NULL COMMENT '0:normal status,1:defense status', + `log_status` int NOT NULL COMMENT '0:normal status,1:defense status', `log_created` datetime(6) NOT NULL COMMENT 'create datetime', `log_modified` datetime(6) NOT NULL COMMENT 'modify datetime', UNIQUE INDEX `ux_undo_log`(`xid`, `branch_id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = 'AT transaction mode undo table' ROW_FORMAT = Dynamic; +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = 'AT transaction mode undo table' ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Records of undo_log +-- ---------------------------- SET FOREIGN_KEY_CHECKS = 1; diff --git a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/interceptor/BloomFilterInterceptor.java b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/interceptor/BloomFilterInterceptor.java index 7bed6b9ec..2b167452f 100644 --- a/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/interceptor/BloomFilterInterceptor.java +++ b/mall-pms/pms-boot/src/main/java/com/youlai/mall/pms/interceptor/BloomFilterInterceptor.java @@ -30,7 +30,8 @@ public class BloomFilterInterceptor implements HandlerInterceptor { @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { - String currentUrl = request.getRequestURI(); + return true; + /* String currentUrl = request.getRequestURI(); PathMatcher matcher = new AntPathMatcher(); Map pathVariable = matcher.extractUriTemplateVariables("/app-api/v1/products/{id}", currentUrl); if (bloomRedisService.includeByBloomFilter(PRODUCT_REDIS_BLOOM_FILTER, pathVariable.get("id"))) { @@ -41,7 +42,7 @@ public class BloomFilterInterceptor implements HandlerInterceptor { response.setCharacterEncoding("UTF-8"); String result = new ObjectMapper().writeValueAsString(Result.failed("产品不存在!")); response.getWriter().print(result); - return false; + return false;*/ }