BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 9d9638b15b4dfaa7f5f0449bcda389e3eaa2c4c7

Authored by owen
2 parents 8ae34014 800c44a4

Merge remote-tracking branch 'origin/feature/mall_product' into member_dev 

# Conflicts:
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/MemberUserController.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/MemberUserConvert.java
Inline Side-by-side
Showing 66 changed files with 870 additions and 478 deletions
... ... @@ -17,9 +17,9 @@
17 17 <module>yudao-module-system</module>
18 18 <module>yudao-module-infra</module>
19 19 <module>yudao-module-pay</module>
20   -<!-- <module>yudao-module-bpm</module>-->
21   -<!-- <module>yudao-module-report</module>-->
22   -<!-- <module>yudao-module-mp</module>-->
  20 + <module>yudao-module-bpm</module>
  21 + <module>yudao-module-report</module>
  22 + <module>yudao-module-mp</module>
23 23 <module>yudao-module-mall</module>
24 24 <!-- 示例项目 -->
25 25 <module>yudao-example</module>
... ...
sql/mysql/member_poinit_20230809积分四张表结构调整.sql deleted
View file @8ae3401
1   -/*
2   - Navicat Premium Data Transfer
3   -
4   - Source Server : docer-master-root(3308)
5   - Source Server Type : MySQL
6   - Source Server Version : 80030
7   - Source Host : 10.211.55.5:3308
8   - Source Schema : mall
9   -
10   - Target Server Type : MySQL
11   - Target Server Version : 80030
12   - File Encoding : 65001
13   -
14   - Date: 09/08/2023 22:41:36
15   -*/
16   -
17   -SET NAMES utf8mb4;
18   -SET FOREIGN_KEY_CHECKS = 0;
19   -
20   --- ----------------------------
21   --- Table structure for member_point_config
22   --- ----------------------------
23   -DROP TABLE IF EXISTS `member_point_config`;
24   -CREATE TABLE `member_point_config` (
25   - `id` bigint NOT NULL AUTO_INCREMENT COMMENT '自增主键',
26   - `trade_deduct_enable` bit(1) DEFAULT NULL COMMENT '1 开启积分抵扣\n0 关闭积分抵扣',
27   - `trade_deduct_unit_price` int DEFAULT NULL COMMENT '积分抵扣(单位：分)',
28   - `trade_deduct_max_price` int DEFAULT NULL COMMENT '积分抵扣最大值',
29   - `trade_give_point` int DEFAULT NULL COMMENT '1元赠送多少分',
30   - `creator` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建人',
31   - `create_time` datetime DEFAULT NULL COMMENT '创建时间',
32   - `updater` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '更新人',
33   - `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '变更时间',
34   - `tenant_id` varchar(255) DEFAULT NULL COMMENT '租户id',
35   - `deleted` bit(1) DEFAULT b'0' COMMENT '是否被删除 0 未删除 1已删除',
36   - PRIMARY KEY (`id`)
37   -) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='会员积分配置表';
38   -
39   --- ----------------------------
40   --- Records of member_point_config
41   --- ----------------------------
42   -BEGIN;
43   -INSERT INTO `member_point_config` (`id`, `trade_deduct_enable`, `trade_deduct_unit_price`, `trade_deduct_max_price`, `trade_give_point`, `creator`, `create_time`, `updater`, `update_time`, `tenant_id`, `deleted`) VALUES (5, b'1', 12504, 1234, 1234, '1', '2023-08-09 22:27:42', '1', '2023-08-09 22:32:55', '1', b'0');
44   -COMMIT;
45   -
46   --- ----------------------------
47   --- Table structure for member_point_record
48   --- ----------------------------
49   -DROP TABLE IF EXISTS `member_point_record`;
50   -CREATE TABLE `member_point_record` (
51   - `id` bigint NOT NULL AUTO_INCREMENT COMMENT '自增主键',
52   - `biz_id` varchar(255) DEFAULT NULL COMMENT '业务编码',
53   - `biz_type` varchar(255) DEFAULT NULL COMMENT '业务类型',
54   - `title` varchar(255) DEFAULT NULL COMMENT '积分标题',
55   - `description` varchar(5000) DEFAULT NULL COMMENT '积分描述',
56   - `point` int DEFAULT NULL COMMENT '积分',
57   - `total_point` int NOT NULL COMMENT '变动后的积分',
58   - `status` int DEFAULT NULL COMMENT '状态：1-订单创建，2-冻结期，3-完成，4-失效（订单退款）\n',
59   - `user_id` bigint DEFAULT NULL COMMENT '用户id',
60   - `freezing_time` datetime DEFAULT NULL COMMENT '冻结时间',
61   - `thawing_time` datetime DEFAULT NULL COMMENT '解冻时间',
62   - `create_time` datetime DEFAULT NULL COMMENT '发生时间',
63   - `tenant_id` varchar(255) DEFAULT NULL COMMENT '租户',
64   - `deleted` int DEFAULT '0' COMMENT '是否删除',
65   - `creator` varchar(255) DEFAULT NULL COMMENT '创建用户',
66   - `updater` varchar(255) DEFAULT NULL COMMENT '更新用户',
67   - `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
68   - PRIMARY KEY (`id`),
69   - KEY `index_userId` (`user_id`),
70   - KEY `index_title` (`title`) USING BTREE
71   -) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='用户积分记录';
72   -
73   --- ----------------------------
74   --- Records of member_point_record
75   --- ----------------------------
76   -BEGIN;
77   -INSERT INTO `member_point_record` (`id`, `biz_id`, `biz_type`, `title`, `description`, `point`, `total_point`, `status`, `user_id`, `freezing_time`, `thawing_time`, `create_time`, `tenant_id`, `deleted`, `creator`, `updater`, `update_time`) VALUES (1, '1', '1', '12', NULL, 212, 12, 1, 247, '2023-06-13 00:00:00', '2023-06-20 00:00:00', '2023-06-10 12:38:48', '1', 1, '1', '1', '2023-08-09 12:30:36');
78   -INSERT INTO `member_point_record` (`id`, `biz_id`, `biz_type`, `title`, `description`, `point`, `total_point`, `status`, `user_id`, `freezing_time`, `thawing_time`, `create_time`, `tenant_id`, `deleted`, `creator`, `updater`, `update_time`) VALUES (2, '12', '1', '这是一个测试', '我是描述', 1212, 12, 2, 247, '2023-06-28 00:00:00', NULL, '2023-06-10 12:42:48', '1', 0, '1', '1', '2023-08-09 12:31:45');
79   -INSERT INTO `member_point_record` (`id`, `biz_id`, `biz_type`, `title`, `description`, `point`, `total_point`, `status`, `user_id`, `freezing_time`, `thawing_time`, `create_time`, `tenant_id`, `deleted`, `creator`, `updater`, `update_time`) VALUES (3, '12', '1', '12', '我是一个描述', 12, 12, 1, 248, '2023-06-27 00:00:00', '2023-06-23 00:00:00', '2023-06-10 20:06:48', '1', 0, '1', '1', '2023-08-09 12:31:41');
80   -INSERT INTO `member_point_record` (`id`, `biz_id`, `biz_type`, `title`, `description`, `point`, `total_point`, `status`, `user_id`, `freezing_time`, `thawing_time`, `create_time`, `tenant_id`, `deleted`, `creator`, `updater`, `update_time`) VALUES (4, '12', '1', '描述2', '我是一个描述', -12, 12, 1, 248, '2023-08-09 11:21:00', '2023-09-13 00:00:00', '2023-06-10 20:06:48', '1', 0, '1', '1', '2023-08-09 12:57:28');
81   -COMMIT;
82   -
83   --- ----------------------------
84   --- Table structure for member_sign_in_config
85   --- ----------------------------
86   -DROP TABLE IF EXISTS `member_sign_in_config`;
87   -CREATE TABLE `member_sign_in_config` (
88   - `id` int NOT NULL AUTO_INCREMENT COMMENT '规则自增主键',
89   - `day` int DEFAULT NULL COMMENT '签到第x天',
90   - `point` int DEFAULT NULL COMMENT '签到天数对应分数',
91   - `create_time` datetime DEFAULT NULL COMMENT '创建时间',
92   - `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '变更时间',
93   - `tenant_id` varchar(255) DEFAULT NULL COMMENT '租户id',
94   - `enable` tinyint(1) DEFAULT NULL COMMENT '是否启用 1启用，0未启动',
95   - `deleted` int DEFAULT '0' COMMENT '是否删除',
96   - `creator` varchar(255) DEFAULT NULL COMMENT '创建人',
97   - `updater` varchar(255) DEFAULT NULL COMMENT '变更人',
98   - PRIMARY KEY (`id`)
99   -) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='积分签到规则';
100   -
101   --- ----------------------------
102   --- Records of member_sign_in_config
103   --- ----------------------------
104   -BEGIN;
105   -INSERT INTO `member_sign_in_config` (`id`, `day`, `point`, `create_time`, `update_time`, `tenant_id`, `enable`, `deleted`, `creator`, `updater`) VALUES (1, 4, 10, '2023-06-10 11:34:43', '2023-08-08 15:10:03', '1', 1, 0, '1', '1');
106   -INSERT INTO `member_sign_in_config` (`id`, `day`, `point`, `create_time`, `update_time`, `tenant_id`, `enable`, `deleted`, `creator`, `updater`) VALUES (2, 2, 20, '2023-06-10 11:34:59', '2023-08-08 13:39:54', '1', 1, 1, '1', '1');
107   -INSERT INTO `member_sign_in_config` (`id`, `day`, `point`, `create_time`, `update_time`, `tenant_id`, `enable`, `deleted`, `creator`, `updater`) VALUES (3, 7, 1001, '2023-06-10 17:47:45', '2023-08-08 15:09:55', '1', 0, 0, '1', '1');
108   -INSERT INTO `member_sign_in_config` (`id`, `day`, `point`, `create_time`, `update_time`, `tenant_id`, `enable`, `deleted`, `creator`, `updater`) VALUES (4, 6, 12121, '2023-06-10 17:47:55', '2023-08-08 15:09:47', '1', 0, 0, '1', '1');
109   -INSERT INTO `member_sign_in_config` (`id`, `day`, `point`, `create_time`, `update_time`, `tenant_id`, `enable`, `deleted`, `creator`, `updater`) VALUES (5, 2, 12, '2023-06-10 19:54:52', '2023-08-08 15:10:03', '1', 1, 0, '1', '1');
110   -COMMIT;
111   -
112   --- ----------------------------
113   --- Table structure for member_sign_in_record
114   --- ----------------------------
115   -DROP TABLE IF EXISTS `member_sign_in_record`;
116   -CREATE TABLE `member_sign_in_record` (
117   - `id` bigint NOT NULL AUTO_INCREMENT COMMENT '签到自增id',
118   - `user_id` bigint DEFAULT NULL COMMENT '签到用户',
119   - `day` int DEFAULT NULL COMMENT '第几天签到',
120   - `point` int DEFAULT NULL COMMENT '签到的分数',
121   - `create_time` datetime DEFAULT NULL COMMENT '签到时间',
122   - `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '变更时间',
123   - `tenant_id` varchar(255) DEFAULT NULL COMMENT '租户id',
124   - `deleted` int DEFAULT '0' COMMENT '是否删除',
125   - `creator` varchar(255) DEFAULT NULL COMMENT '创建人',
126   - `updater` varchar(255) DEFAULT NULL COMMENT '更新人',
127   - PRIMARY KEY (`id`)
128   -) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='用户签到积分';
129   -
130   --- ----------------------------
131   --- Records of member_sign_in_record
132   --- ----------------------------
133   -BEGIN;
134   -INSERT INTO `member_sign_in_record` (`id`, `user_id`, `day`, `point`, `create_time`, `update_time`, `tenant_id`, `deleted`, `creator`, `updater`) VALUES (1, 247, 1, 123, '2023-06-10 12:58:18', '2023-08-09 08:51:31', '1', 1, '1', '1');
135   -INSERT INTO `member_sign_in_record` (`id`, `user_id`, `day`, `point`, `create_time`, `update_time`, `tenant_id`, `deleted`, `creator`, `updater`) VALUES (2, 247, 12, 12, '2023-06-10 19:56:39', '2023-08-09 08:51:32', '1', 1, '1', '1');
136   -INSERT INTO `member_sign_in_record` (`id`, `user_id`, `day`, `point`, `create_time`, `update_time`, `tenant_id`, `deleted`, `creator`, `updater`) VALUES (3, 1, 12, 1212, '2023-06-10 20:01:17', '2023-08-09 08:05:07', '1', 1, '1', '1');
137   -INSERT INTO `member_sign_in_record` (`id`, `user_id`, `day`, `point`, `create_time`, `update_time`, `tenant_id`, `deleted`, `creator`, `updater`) VALUES (4, 247, 12, 1212, '2023-06-10 20:01:27', '2023-08-09 08:51:34', '1', 0, '1', '1');
138   -COMMIT;
139   -
140   -SET FOREIGN_KEY_CHECKS = 1;
sql/mysql/ruoyi-vue-pro.sql
  View file @9d9638b
... ... @@ -3,15 +3,15 @@
3 3  
4 4 Source Server : 127.0.0.1 MySQL
5 5 Source Server Type : MySQL
6   - Source Server Version : 80026
  6 + Source Server Version : 80034
7 7 Source Host : localhost:3306
8 8 Source Schema : ruoyi-vue-pro
9 9  
10 10 Target Server Type : MySQL
11   - Target Server Version : 80026
  11 + Target Server Version : 80034
12 12 File Encoding : 65001
13 13  
14   - Date: 24/07/2023 08:51:31
  14 + Date: 20/08/2023 19:42:16
15 15 */
16 16  
17 17 SET NAMES utf8mb4;
... ... @@ -360,7 +360,7 @@ CREATE TABLE `infra_api_error_log` (
360 360 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
361 361 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
362 362 PRIMARY KEY (`id`) USING BTREE
363   -) ENGINE = InnoDB AUTO_INCREMENT = 1391 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '系统异常日志';
  363 +) ENGINE = InnoDB AUTO_INCREMENT = 1453 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '系统异常日志';
364 364  
365 365 -- ----------------------------
366 366 -- Records of infra_api_error_log
... ... @@ -398,7 +398,7 @@ CREATE TABLE `infra_codegen_column` (
398 398 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
399 399 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
400 400 PRIMARY KEY (`id`) USING BTREE
401   -) ENGINE = InnoDB AUTO_INCREMENT = 1715 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '代码生成表字段定义';
  401 +) ENGINE = InnoDB AUTO_INCREMENT = 1756 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '代码生成表字段定义';
402 402  
403 403 -- ----------------------------
404 404 -- Records of infra_codegen_column
... ... @@ -431,7 +431,7 @@ CREATE TABLE `infra_codegen_table` (
431 431 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
432 432 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
433 433 PRIMARY KEY (`id`) USING BTREE
434   -) ENGINE = InnoDB AUTO_INCREMENT = 132 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '代码生成表定义';
  434 +) ENGINE = InnoDB AUTO_INCREMENT = 134 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '代码生成表定义';
435 435  
436 436 -- ----------------------------
437 437 -- Records of infra_codegen_table
... ... @@ -514,7 +514,7 @@ CREATE TABLE `infra_file` (
514 514 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
515 515 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
516 516 PRIMARY KEY (`id`) USING BTREE
517   -) ENGINE = InnoDB AUTO_INCREMENT = 953 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '文件表';
  517 +) ENGINE = InnoDB AUTO_INCREMENT = 975 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '文件表';
518 518  
519 519 -- ----------------------------
520 520 -- Records of infra_file
... ... @@ -568,7 +568,7 @@ CREATE TABLE `infra_file_content` (
568 568 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
569 569 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
570 570 PRIMARY KEY (`id`) USING BTREE
571   -) ENGINE = InnoDB AUTO_INCREMENT = 44 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '文件表';
  571 +) ENGINE = InnoDB AUTO_INCREMENT = 66 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '文件表';
572 572  
573 573 -- ----------------------------
574 574 -- Records of infra_file_content
... ... @@ -664,19 +664,195 @@ BEGIN;
664 664 COMMIT;
665 665  
666 666 -- ----------------------------
  667 +-- Table structure for member_address
  668 +-- ----------------------------
  669 +DROP TABLE IF EXISTS `member_address`;
  670 +CREATE TABLE `member_address` (
  671 + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '收件地址编号',
  672 + `user_id` bigint NOT NULL COMMENT '用户编号',
  673 + `name` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '收件人名称',
  674 + `mobile` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '手机号',
  675 + `area_id` bigint NOT NULL COMMENT '地区编码',
  676 + `detail_address` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '收件详细地址',
  677 + `default_status` bit(1) NOT NULL COMMENT '是否默认',
  678 + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
  679 + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
  680 + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
  681 + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
  682 + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
  683 + `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
  684 + PRIMARY KEY (`id`) USING BTREE,
  685 + INDEX `idx_userId`(`user_id` ASC) USING BTREE
  686 +) ENGINE = InnoDB AUTO_INCREMENT = 24 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '用户收件地址';
  687 +
  688 +-- ----------------------------
  689 +-- Records of member_address
  690 +-- ----------------------------
  691 +BEGIN;
  692 +INSERT INTO `member_address` (`id`, `user_id`, `name`, `mobile`, `area_id`, `detail_address`, `default_status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (21, 247, 'yunai', '15601691300', 140302, '芋道源码 233 号 666 室', b'1', '1', '2022-08-01 22:46:35', '247', '2023-06-26 19:47:46', b'0', 1);
  693 +INSERT INTO `member_address` (`id`, `user_id`, `name`, `mobile`, `area_id`, `detail_address`, `default_status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (23, 247, '测试', '15601691300', 120103, '13232312', b'0', '247', '2023-06-26 19:47:40', '247', '2023-06-26 19:47:46', b'0', 1);
  694 +COMMIT;
  695 +
  696 +-- ----------------------------
  697 +-- Table structure for member_point_config
  698 +-- ----------------------------
  699 +DROP TABLE IF EXISTS `member_point_config`;
  700 +CREATE TABLE `member_point_config` (
  701 + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '自增主键',
  702 + `trade_deduct_enable` bit(1) NOT NULL COMMENT '是否开启积分抵扣',
  703 + `trade_deduct_unit_price` int NOT NULL COMMENT '积分抵扣(单位：分)',
  704 + `trade_deduct_max_price` int NULL DEFAULT NULL COMMENT '积分抵扣最大值',
  705 + `trade_give_point` bigint NULL DEFAULT NULL COMMENT '1 元赠送多少分',
  706 + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
  707 + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
  708 + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
  709 + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
  710 + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
  711 + `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
  712 + PRIMARY KEY (`id`) USING BTREE
  713 +) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '会员积分配置表';
  714 +
  715 +-- ----------------------------
  716 +-- Records of member_point_config
  717 +-- ----------------------------
  718 +BEGIN;
  719 +INSERT INTO `member_point_config` (`id`, `trade_deduct_enable`, `trade_deduct_unit_price`, `trade_deduct_max_price`, `trade_give_point`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (5, b'1', 100, 2, 3, '1', '2023-08-20 09:54:42', '1', '2023-08-20 09:54:42', b'0', 1);
  720 +COMMIT;
  721 +
  722 +-- ----------------------------
  723 +-- Table structure for member_point_record
  724 +-- ----------------------------
  725 +DROP TABLE IF EXISTS `member_point_record`;
  726 +CREATE TABLE `member_point_record` (
  727 + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '自增主键',
  728 + `user_id` bigint NOT NULL COMMENT '用户编号',
  729 + `biz_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '业务编码',
  730 + `biz_type` tinyint NOT NULL COMMENT '业务类型',
  731 + `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '积分标题',
  732 + `description` varchar(5000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '积分描述',
  733 + `point` int NOT NULL COMMENT '积分',
  734 + `total_point` int NOT NULL COMMENT '变动后的积分',
  735 + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
  736 + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
  737 + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
  738 + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
  739 + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
  740 + `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
  741 + PRIMARY KEY (`id`) USING BTREE,
  742 + INDEX `index_userId`(`user_id` ASC) USING BTREE,
  743 + INDEX `index_title`(`title` ASC) USING BTREE
  744 +) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '用户积分记录';
  745 +
  746 +-- ----------------------------
  747 +-- Records of member_point_record
  748 +-- ----------------------------
  749 +BEGIN;
  750 +INSERT INTO `member_point_record` (`id`, `user_id`, `biz_id`, `biz_type`, `title`, `description`, `point`, `total_point`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, 247, '1', 1, '12', NULL, 33, 12, '', '2023-07-02 14:50:23', '', '2023-08-20 11:03:01', b'0', 1);
  751 +INSERT INTO `member_point_record` (`id`, `user_id`, `biz_id`, `biz_type`, `title`, `description`, `point`, `total_point`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2, 247, '12', 1, '123', NULL, 22, 130, '', '2023-07-02 14:50:23', '', '2023-08-20 11:03:00', b'0', 1);
  752 +INSERT INTO `member_point_record` (`id`, `user_id`, `biz_id`, `biz_type`, `title`, `description`, `point`, `total_point`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (3, 247, '12', 1, '12', NULL, -12, 12, '', '2023-07-02 14:50:23', '', '2023-08-20 11:02:50', b'0', 1);
  753 +COMMIT;
  754 +
  755 +-- ----------------------------
  756 +-- Table structure for member_sign_in_config
  757 +-- ----------------------------
  758 +DROP TABLE IF EXISTS `member_sign_in_config`;
  759 +CREATE TABLE `member_sign_in_config` (
  760 + `id` int NOT NULL AUTO_INCREMENT COMMENT '编号',
  761 + `day` int NOT NULL COMMENT '第几天',
  762 + `point` int NOT NULL COMMENT '奖励积分',
  763 + `status` tinyint NOT NULL COMMENT '状态',
  764 + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
  765 + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
  766 + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
  767 + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
  768 + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
  769 + `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
  770 + PRIMARY KEY (`id`) USING BTREE
  771 +) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '签到规则';
  772 +
  773 +-- ----------------------------
  774 +-- Records of member_sign_in_config
  775 +-- ----------------------------
  776 +BEGIN;
  777 +INSERT INTO `member_sign_in_config` (`id`, `day`, `point`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, 1, 10, 0, '', '2023-08-20 01:38:56', '', '2023-08-20 01:38:56', b'0', 0);
  778 +INSERT INTO `member_sign_in_config` (`id`, `day`, `point`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2, 2, 20, 0, '', '2023-08-20 01:38:56', '', '2023-08-20 01:38:56', b'0', 0);
  779 +INSERT INTO `member_sign_in_config` (`id`, `day`, `point`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (3, 7, 1001, 0, '', '2023-08-20 01:38:56', '', '2023-08-20 01:38:56', b'0', 0);
  780 +INSERT INTO `member_sign_in_config` (`id`, `day`, `point`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (4, 6, 12121, 0, '', '2023-08-20 01:38:56', '', '2023-08-20 01:38:56', b'0', 0);
  781 +INSERT INTO `member_sign_in_config` (`id`, `day`, `point`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (5, 2, 12, 0, '', '2023-08-20 01:38:56', '', '2023-08-20 01:38:56', b'0', 0);
  782 +INSERT INTO `member_sign_in_config` (`id`, `day`, `point`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (6, 1, 10, 0, '1', '2023-08-20 19:20:42', '1', '2023-08-20 19:20:56', b'0', 1);
  783 +INSERT INTO `member_sign_in_config` (`id`, `day`, `point`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (7, 7, 22, 0, '1', '2023-08-20 19:20:48', '1', '2023-08-20 19:20:48', b'0', 1);
  784 +COMMIT;
  785 +
  786 +-- ----------------------------
  787 +-- Table structure for member_sign_in_record
  788 +-- ----------------------------
  789 +DROP TABLE IF EXISTS `member_sign_in_record`;
  790 +CREATE TABLE `member_sign_in_record` (
  791 + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '签到自增id',
  792 + `user_id` int NULL DEFAULT NULL COMMENT '签到用户',
  793 + `day` int NULL DEFAULT NULL COMMENT '第几天签到',
  794 + `point` int NULL DEFAULT NULL COMMENT '签到的分数',
  795 + `create_time` datetime NULL DEFAULT NULL COMMENT '签到时间',
  796 + `update_time` datetime NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '变更时间',
  797 + `tenant_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '租户id',
  798 + `deleted` int NULL DEFAULT 0 COMMENT '是否删除',
  799 + `creator` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人',
  800 + `updater` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人',
  801 + PRIMARY KEY (`id`) USING BTREE
  802 +) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '签到记录';
  803 +
  804 +-- ----------------------------
  805 +-- Records of member_sign_in_record
  806 +-- ----------------------------
  807 +BEGIN;
  808 +INSERT INTO `member_sign_in_record` (`id`, `user_id`, `day`, `point`, `create_time`, `update_time`, `tenant_id`, `deleted`, `creator`, `updater`) VALUES (4, 247, 12, 1212, '2023-06-10 20:01:27', '2023-08-20 11:29:50', '1', 0, '1', '1');
  809 +COMMIT;
  810 +
  811 +-- ----------------------------
  812 +-- Table structure for member_tag
  813 +-- ----------------------------
  814 +DROP TABLE IF EXISTS `member_tag`;
  815 +CREATE TABLE `member_tag` (
  816 + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
  817 + `name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '标签名称',
  818 + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者',
  819 + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
  820 + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者',
  821 + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
  822 + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
  823 + `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
  824 + PRIMARY KEY (`id`) USING BTREE
  825 +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '会员标签';
  826 +
  827 +-- ----------------------------
  828 +-- Records of member_tag
  829 +-- ----------------------------
  830 +BEGIN;
  831 +INSERT INTO `member_tag` (`id`, `name`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, '绿色', '1', '2023-08-20 09:21:12', '1', '2023-08-20 09:21:12', b'0', 1);
  832 +INSERT INTO `member_tag` (`id`, `name`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2, '黄色', '1', '2023-08-20 09:21:27', '1', '2023-08-20 09:21:27', b'0', 1);
  833 +COMMIT;
  834 +
  835 +-- ----------------------------
667 836 -- Table structure for member_user
668 837 -- ----------------------------
669 838 DROP TABLE IF EXISTS `member_user`;
670 839 CREATE TABLE `member_user` (
671 840 `id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号',
672   - `nickname` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户昵称',
673   - `avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '头像',
674   - `status` tinyint NOT NULL COMMENT '状态',
675 841 `mobile` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '手机号',
676 842 `password` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '密码',
  843 + `status` tinyint NOT NULL COMMENT '状态',
677 844 `register_ip` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '注册 IP',
678 845 `login_ip` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '最后登录IP',
679 846 `login_date` datetime NULL DEFAULT NULL COMMENT '最后登录时间',
  847 + `nickname` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '用户昵称',
  848 + `avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '头像',
  849 + `name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '真实名字',
  850 + `sex` tinyint NULL DEFAULT 0 COMMENT '用户性别',
  851 + `area_id` bigint NULL DEFAULT NULL COMMENT '所在地',
  852 + `birthday` datetime NULL DEFAULT NULL COMMENT '出生日期',
  853 + `mark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '会员备注',
  854 + `point` int NOT NULL DEFAULT 0 COMMENT '积分',
  855 + `tag_ids` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户标签编号列表，以逗号分隔',
680 856 `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者',
681 857 `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
682 858 `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者',
... ... @@ -685,7 +861,7 @@ CREATE TABLE `member_user` (
685 861 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
686 862 PRIMARY KEY (`id`) USING BTREE,
687 863 UNIQUE INDEX `uk_mobile`(`mobile` ASC) USING BTREE COMMENT '手机号'
688   -) ENGINE = InnoDB AUTO_INCREMENT = 248 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户';
  864 +) ENGINE = InnoDB AUTO_INCREMENT = 248 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '会员用户';
689 865  
690 866 -- ----------------------------
691 867 -- Records of member_user
... ... @@ -753,7 +929,7 @@ CREATE TABLE `system_dict_data` (
753 929 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
754 930 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
755 931 PRIMARY KEY (`id`) USING BTREE
756   -) ENGINE = InnoDB AUTO_INCREMENT = 1348 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典数据表';
  932 +) ENGINE = InnoDB AUTO_INCREMENT = 1350 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典数据表';
757 933  
758 934 -- ----------------------------
759 935 -- Records of system_dict_data
... ... @@ -794,9 +970,6 @@ INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `st
794 970 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (44, 100, '未知异常', '100', 'system_login_result', 0, 'danger', '', '登陆结果 - 未知异常', '', '2021-01-18 06:17:54', '1', '2022-02-16 13:24:23', b'0');
795 971 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (45, 1, '是', 'true', 'infra_boolean_string', 0, 'danger', '', 'Boolean 是否类型 - 是', '', '2021-01-19 03:20:55', '1', '2022-03-15 23:01:45', b'0');
796 972 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (46, 1, '否', 'false', 'infra_boolean_string', 0, 'info', '', 'Boolean 是否类型 - 否', '', '2021-01-19 03:20:55', '1', '2022-03-15 23:09:45', b'0');
797   -INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (47, 1, '永不超时', '1', 'infra_redis_timeout_type', 0, 'primary', '', 'Redis 未设置超时的情况', '', '2021-01-26 00:53:17', '1', '2022-02-16 19:03:35', b'0');
798   -INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (48, 1, '动态超时', '2', 'infra_redis_timeout_type', 0, 'info', '', '程序里动态传入超时时间，无法固定', '', '2021-01-26 00:55:00', '1', '2022-02-16 19:03:41', b'0');
799   -INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (49, 3, '固定超时', '3', 'infra_redis_timeout_type', 0, 'success', '', 'Redis 设置了过期时间', '', '2021-01-26 00:55:26', '1', '2022-02-16 19:03:45', b'0');
800 973 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (50, 1, '单表（增删改查）', '1', 'infra_codegen_template_type', 0, '', '', NULL, '', '2021-02-05 07:09:06', '', '2022-03-10 16:33:15', b'0');
801 974 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (51, 2, '树表（增删改查）', '2', 'infra_codegen_template_type', 0, '', '', NULL, '', '2021-02-05 07:14:46', '', '2022-03-10 16:33:19', b'0');
802 975 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (53, 0, '初始化中', '0', 'infra_job_status', 0, 'primary', '', NULL, '', '2021-02-07 07:46:49', '1', '2022-02-16 19:33:29', b'0');
... ... @@ -945,7 +1118,6 @@ INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `st
945 1118 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1226, 30, '不发送', '30', 'system_mail_send_status', 0, 'info', '', '邮件发送状态 - 不发送', '1', '2023-01-26 09:55:06', '1', '2023-01-26 16:36:36', b'0');
946 1119 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1227, 1, '通知公告', '1', 'system_notify_template_type', 0, 'primary', '', '站内信模版的类型 - 通知公告', '1', '2023-01-28 10:35:59', '1', '2023-01-28 10:35:59', b'0');
947 1120 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1228, 2, '系统消息', '2', 'system_notify_template_type', 0, 'success', '', '站内信模版的类型 - 系统消息', '1', '2023-01-28 10:36:20', '1', '2023-01-28 10:36:25', b'0');
948   -INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1229, 0, '模拟支付', 'mock', 'pay_channel_code', 0, 'default', '', '模拟支付', '1', '2023-02-12 21:50:22', '1', '2023-07-10 10:11:02', b'0');
949 1121 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1230, 13, '支付宝条码支付', 'alipay_bar', 'pay_channel_code', 0, 'primary', '', '支付宝条码支付', '1', '2023-02-18 23:32:24', '1', '2023-07-19 20:09:23', b'0');
950 1122 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1231, 10, 'Vue2 Element UI 标准模版', '10', 'infra_codegen_front_type', 0, '', '', '', '1', '2023-04-13 00:03:55', '1', '2023-04-13 00:03:55', b'0');
951 1123 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1232, 20, 'Vue3 Element Plus 标准模版', '20', 'infra_codegen_front_type', 0, '', '', '', '1', '2023-04-13 00:04:08', '1', '2023-04-13 00:04:08', b'0');
... ... @@ -963,12 +1135,8 @@ INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `st
963 1135 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1244, 0, '按件', '1', 'trade_delivery_express_charge_mode', 0, '', '', '', '1', '2023-05-21 22:46:40', '1', '2023-05-21 22:46:40', b'0');
964 1136 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1245, 1, '按重量', '2', 'trade_delivery_express_charge_mode', 0, '', '', '', '1', '2023-05-21 22:46:58', '1', '2023-05-21 22:46:58', b'0');
965 1137 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1246, 2, '按体积', '3', 'trade_delivery_express_charge_mode', 0, '', '', '', '1', '2023-05-21 22:47:18', '1', '2023-05-21 22:47:18', b'0');
966   -INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1335, 1, '购物', '1', 'member_point_biz_type', 0, '', '', '', '1', '2023-06-10 12:15:27', '1', '2023-06-28 13:48:28', b'0');
967   -INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1336, 2, '签到', '2', 'member_point_biz_type', 0, '', '', '', '1', '2023-06-10 12:15:48', '1', '2023-06-28 13:48:31', b'0');
968   -INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1337, 1, '订单创建', '1', 'member_point_status', 0, '', '', '', '1', '2023-06-10 12:16:42', '1', '2023-06-28 13:48:34', b'0');
969   -INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1338, 2, '冻结期', '2', 'member_point_status', 0, '', '', '', '1', '2023-06-10 12:16:58', '1', '2023-06-28 13:48:36', b'0');
970   -INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1339, 3, '完成', '3', 'member_point_status', 0, '', '', '', '1', '2023-06-10 12:17:07', '1', '2023-06-28 13:48:38', b'0');
971   -INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1340, 4, '失效(订单退款)', '4', 'member_point_status', 0, '', '', '', '1', '2023-06-10 12:17:21', '1', '2023-06-28 13:48:42', b'0');
  1138 +INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1335, 11, '订单消费', '11', 'member_point_biz_type', 0, '', '', '', '1', '2023-06-10 12:15:27', '1', '2023-08-20 11:59:47', b'0');
  1139 +INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1336, 1, '签到', '1', 'member_point_biz_type', 0, '', '', '', '1', '2023-06-10 12:15:48', '1', '2023-08-20 11:59:53', b'0');
972 1140 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1341, 20, '已退款', '20', 'pay_order_status', 0, 'danger', '', '已退款', '1', '2023-07-19 18:05:37', '1', '2023-07-19 18:05:37', b'0');
973 1141 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1342, 21, '请求成功，但是结果失败', '21', 'pay_notify_status', 0, 'warning', '', '请求成功，但是结果失败', '1', '2023-07-19 18:10:47', '1', '2023-07-19 18:11:38', b'0');
974 1142 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1343, 22, '请求失败', '22', 'pay_notify_status', 0, 'warning', '', NULL, '1', '2023-07-19 18:11:05', '1', '2023-07-19 18:11:27', b'0');
... ... @@ -976,6 +1144,8 @@ INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `st
976 1144 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1345, 5, '微信条码支付', 'wx_bar', 'pay_channel_code', 0, 'success', '', '微信条码支付\n', '1', '2023-07-19 20:08:06', '1', '2023-07-19 20:09:08', b'0');
977 1145 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1346, 1, '支付单', '1', 'pay_notify_type', 0, 'primary', '', '支付单', '1', '2023-07-20 12:23:17', '1', '2023-07-20 12:23:17', b'0');
978 1146 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1347, 2, '退款单', '2', 'pay_notify_type', 0, 'danger', '', NULL, '1', '2023-07-20 12:23:26', '1', '2023-07-20 12:23:26', b'0');
  1147 +INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1348, 20, '模拟支付', 'mock', 'pay_channel_code', 0, 'default', '', '模拟支付', '1', '2023-07-29 11:10:51', '1', '2023-07-29 03:14:10', b'0');
  1148 +INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1349, 12, '订单取消', '12', 'member_point_biz_type', 0, '', '', '', '1', '2023-08-20 12:00:03', '1', '2023-08-20 12:00:03', b'0');
979 1149 COMMIT;
980 1150  
981 1151 -- ----------------------------
... ... @@ -1009,7 +1179,6 @@ INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creat
1009 1179 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (10, '系统状态', 'common_status', 0, NULL, 'admin', '2021-01-05 17:03:48', '', '2022-02-01 16:21:28', b'0', NULL);
1010 1180 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (11, 'Boolean 是否类型', 'infra_boolean_string', 0, 'boolean 转是否', '', '2021-01-19 03:20:08', '', '2022-02-01 16:37:10', b'0', NULL);
1011 1181 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (104, '登陆结果', 'system_login_result', 0, '登陆结果', '', '2021-01-18 06:17:11', '', '2022-02-01 16:36:00', b'0', NULL);
1012   -INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (105, 'Redis 超时类型', 'infra_redis_timeout_type', 0, 'RedisKeyDefine.TimeoutTypeEnum', '', '2021-01-26 00:52:50', '', '2022-02-01 16:50:29', b'0', NULL);
1013 1182 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (106, '代码生成模板类型', 'infra_codegen_template_type', 0, NULL, '', '2021-02-05 07:08:06', '1', '2022-05-16 20:26:50', b'0', NULL);
1014 1183 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (107, '定时任务状态', 'infra_job_status', 0, NULL, '', '2021-02-07 07:44:16', '', '2022-02-01 16:51:11', b'0', NULL);
1015 1184 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (108, '定时任务日志状态', 'infra_job_log_status', 0, NULL, '', '2021-02-08 10:03:51', '', '2022-02-01 16:50:43', b'0', NULL);
... ... @@ -1059,7 +1228,6 @@ INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creat
1059 1228 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (169, '商品的单位', 'product_unit', 0, '商品的单位', '1', '2023-05-24 21:23:59', '1', '2023-05-24 21:23:59', b'0', '1970-01-01 00:00:00');
1060 1229 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (170, '快递计费方式', 'trade_delivery_express_charge_mode', 0, '用于商城交易模块配送管理', '1', '2023-05-21 22:45:03', '1', '2023-05-21 22:45:03', b'0', '1970-01-01 00:00:00');
1061 1230 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (171, '积分业务类型', 'member_point_biz_type', 0, '', '1', '2023-06-10 12:15:00', '1', '2023-06-28 13:48:20', b'0', '1970-01-01 00:00:00');
1062   -INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (172, '积分订单状态', 'member_point_status', 0, '', '1', '2023-06-10 12:16:27', '1', '2023-06-28 13:48:17', b'0', '1970-01-01 00:00:00');
1063 1231 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (173, '支付通知类型', 'pay_notify_type', 0, NULL, '1', '2023-07-20 12:23:03', '1', '2023-07-20 12:23:03', b'0', '1970-01-01 00:00:00');
1064 1232 COMMIT;
1065 1233  
... ... @@ -1080,7 +1248,7 @@ CREATE TABLE `system_error_code` (
1080 1248 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
1081 1249 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
1082 1250 PRIMARY KEY (`id`) USING BTREE
1083   -) ENGINE = InnoDB AUTO_INCREMENT = 5833 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '错误码表';
  1251 +) ENGINE = InnoDB AUTO_INCREMENT = 5933 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '错误码表';
1084 1252  
1085 1253 -- ----------------------------
1086 1254 -- Records of system_error_code
... ... @@ -1109,7 +1277,7 @@ CREATE TABLE `system_login_log` (
1109 1277 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
1110 1278 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
1111 1279 PRIMARY KEY (`id`) USING BTREE
1112   -) ENGINE = InnoDB AUTO_INCREMENT = 2243 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '系统访问记录';
  1280 +) ENGINE = InnoDB AUTO_INCREMENT = 2303 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '系统访问记录';
1113 1281  
1114 1282 -- ----------------------------
1115 1283 -- Records of system_login_log
... ... @@ -1239,7 +1407,7 @@ CREATE TABLE `system_menu` (
1239 1407 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
1240 1408 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
1241 1409 PRIMARY KEY (`id`) USING BTREE
1242   -) ENGINE = InnoDB AUTO_INCREMENT = 2303 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '菜单权限表';
  1410 +) ENGINE = InnoDB AUTO_INCREMENT = 2325 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '菜单权限表';
1243 1411  
1244 1412 -- ----------------------------
1245 1413 -- Records of system_menu
... ... @@ -1497,7 +1665,7 @@ INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_i
1497 1665 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2028, 'Banner更新', 'market:banner:update', 3, 3, 2025, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2022-08-01 14:56:14', '', '2022-08-01 14:56:14', b'0');
1498 1666 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2029, 'Banner删除', 'market:banner:delete', 3, 4, 2025, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2022-08-01 14:56:14', '', '2022-08-01 14:56:14', b'0');
1499 1667 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2030, '营销中心', '', 1, 70, 0, '/promotion', 'rate', NULL, NULL, 0, b'1', b'1', b'1', '1', '2022-10-31 21:25:09', '1', '2022-10-31 21:25:09', b'0');
1500   -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2032, '优惠劵', '', 2, 2, 2030, 'coupon-template', 'textarea', 'mall/promotion/couponTemplate/index', 'PromotionCouponTemplate', 0, b'1', b'1', b'1', '', '2022-10-31 22:27:14', '1', '2023-04-08 11:44:23', b'0');
  1668 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2032, '优惠劵', '', 2, 1, 2030, 'coupon-template', 'ep:discount', 'mall/promotion/coupon/template/index', 'PromotionCouponTemplate', 0, b'1', b'1', b'1', '', '2022-10-31 22:27:14', '1', '2023-08-12 11:35:35', b'0');
1501 1669 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2033, '优惠劵模板查询', 'promotion:coupon-template:query', 3, 1, 2032, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2022-10-31 22:27:14', '', '2022-10-31 22:27:14', b'0');
1502 1670 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2034, '优惠劵模板创建', 'promotion:coupon-template:create', 3, 2, 2032, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2022-10-31 22:27:14', '', '2022-10-31 22:27:14', b'0');
1503 1671 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2035, '优惠劵模板更新', 'promotion:coupon-template:update', 3, 3, 2032, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2022-10-31 22:27:14', '', '2022-10-31 22:27:14', b'0');
... ... @@ -1522,7 +1690,6 @@ INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_i
1522 1690 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2061, '秒杀活动创建', 'promotion:seckill-activity:create', 3, 2, 2059, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2022-11-06 22:24:49', '', '2022-11-06 22:24:49', b'0');
1523 1691 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2062, '秒杀活动更新', 'promotion:seckill-activity:update', 3, 3, 2059, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2022-11-06 22:24:49', '', '2022-11-06 22:24:49', b'0');
1524 1692 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2063, '秒杀活动删除', 'promotion:seckill-activity:delete', 3, 4, 2059, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2022-11-06 22:24:49', '', '2022-11-06 22:24:49', b'0');
1525   -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2064, '秒杀活动导出', 'promotion:seckill-activity:export', 3, 5, 2059, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2022-11-06 22:24:49', '', '2022-11-06 22:24:49', b'0');
1526 1693 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2066, '秒杀时段', '', 2, 1, 2209, 'config', 'ep:baseball', 'mall/promotion/seckill/config/index', 'PromotionSeckillConfig', 0, b'1', b'1', b'1', '', '2022-11-15 19:46:50', '1', '2023-06-24 18:57:14', b'0');
1527 1694 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2067, '秒杀时段查询', 'promotion:seckill-config:query', 3, 1, 2066, '', '', '', '', 0, b'1', b'1', b'1', '', '2022-11-15 19:46:51', '1', '2023-06-24 17:50:25', b'0');
1528 1695 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2068, '秒杀时段创建', 'promotion:seckill-config:create', 3, 2, 2066, '', '', '', '', 0, b'1', b'1', b'1', '', '2022-11-15 19:46:51', '1', '2023-06-24 17:48:39', b'0');
... ... @@ -1531,7 +1698,7 @@ INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_i
1531 1698 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2072, '订单中心', '', 1, 65, 0, '/trade', 'order', NULL, NULL, 0, b'1', b'1', b'1', '1', '2022-11-19 18:57:19', '1', '2022-12-10 16:32:57', b'0');
1532 1699 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2073, '售后退款', '', 2, 1, 2072, 'trade/after-sale', 'education', 'mall/trade/afterSale/index', 'TradeAfterSale', 0, b'1', b'1', b'1', '', '2022-11-19 20:15:32', '1', '2023-04-08 11:43:19', b'0');
1533 1700 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2074, '售后查询', 'trade:after-sale:query', 3, 1, 2073, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2022-11-19 20:15:33', '1', '2022-12-10 21:04:29', b'0');
1534   -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2075, '秒杀活动关闭', 'promotion:sekill-activity:close', 3, 6, 2059, '', '', '', NULL, 0, b'1', b'1', b'1', '1', '2022-11-28 20:20:15', '1', '2022-11-28 20:20:15', b'0');
  1701 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2075, '秒杀活动关闭', 'promotion:sekill-activity:close', 3, 5, 2059, '', '', '', '', 0, b'1', b'1', b'1', '1', '2022-11-28 20:20:15', '1', '2023-08-12 17:53:02', b'0');
1535 1702 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2076, '订单列表', '', 2, 0, 2072, 'trade/order', 'list', 'mall/trade/order/index', 'TradeOrder', 0, b'1', b'1', b'1', '1', '2022-12-10 21:05:44', '1', '2023-04-08 11:42:23', b'0');
1536 1703 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2083, '地区管理', '', 2, 14, 1, 'area', 'row', 'system/area/index', 'SystemArea', 0, b'1', b'1', b'1', '1', '2022-12-23 17:35:05', '1', '2023-04-08 09:01:37', b'0');
1537 1704 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2084, '公众号管理', '', 1, 100, 0, '/mp', 'wechat', NULL, NULL, 0, b'1', b'1', b'1', '1', '2023-01-01 20:11:04', '1', '2023-01-15 11:28:57', b'0');
... ... @@ -1635,24 +1802,46 @@ INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_i
1635 1802 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2183, '自提门店删除', 'trade:delivery:pick-up-store:delete', 3, 4, 2179, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-05-25 10:53:29', '', '2023-05-25 10:53:29', b'0');
1636 1803 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2184, '自提门店导出', 'trade:delivery:pick-up-store:export', 3, 5, 2179, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-05-25 10:53:29', '', '2023-05-25 10:53:29', b'0');
1637 1804 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2209, '秒杀活动', '', 2, 3, 2030, 'seckill', 'ep:place', '', '', 0, b'1', b'1', b'1', '1', '2023-06-24 17:39:13', '1', '2023-06-24 18:55:15', b'0');
1638   -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2262, '会员中心', '', 1, 55, 0, '/member', 'date-range', NULL, NULL, 0, b'1', b'1', b'1', '1', '2023-06-10 00:42:03', '1', '2023-06-28 22:52:34', b'0');
1639   -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2275, '积分配置', '', 2, 0, 2299, 'config', '', 'member/point/config/index', 'PointConfig', 0, b'1', b'1', b'1', '', '2023-06-10 02:07:44', '1', '2023-06-27 22:50:59', b'0');
1640   -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2276, '积分设置查询', 'member:point:config:get', 3, 1, 2275, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-06-10 02:07:44', '', '2023-06-10 02:07:44', b'0');
1641   -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2277, '积分设置创建', 'member:point:config:save', 3, 2, 2275, '', '', '', '', 0, b'1', b'1', b'1', '', '2023-06-10 02:07:44', '1', '2023-06-27 20:32:31', b'0');
1642   -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2281, '签到配置', '', 2, 2, 2300, 'sign-in-config', '', 'member/signin/config/index', 'SignInConfig', 0, b'1', b'1', b'1', '', '2023-06-10 03:26:12', '1', '2023-07-02 15:04:15', b'0');
1643   -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2282, '积分签到规则查询', 'member:point:sign-in-config:query', 3, 1, 2281, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-06-10 03:26:12', '', '2023-06-10 03:26:12', b'0');
1644   -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2283, '积分签到规则创建', 'member:point:sign-in-config:create', 3, 2, 2281, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-06-10 03:26:12', '', '2023-06-10 03:26:12', b'0');
1645   -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2284, '积分签到规则更新', 'member:point:sign-in-config:update', 3, 3, 2281, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-06-10 03:26:12', '', '2023-06-10 03:26:12', b'0');
1646   -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2285, '积分签到规则删除', 'member:point:sign-in-config:delete', 3, 4, 2281, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-06-10 03:26:12', '', '2023-06-10 03:26:12', b'0');
1647   -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2286, '积分签到规则获取', 'member:point:sign-in-config:get', 3, 5, 2281, '', '', '', '', 0, b'1', b'1', b'1', '', '2023-06-10 03:26:12', '1', '2023-08-19 09:48:32', b'0');
1648   -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2287, '积分记录', '', 2, 1, 2299, 'record', '', 'member/point/record/index', 'PointRecord', 0, b'1', b'1', b'1', '', '2023-06-10 04:18:50', '1', '2023-06-27 22:51:07', b'0');
1649   -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2288, '用户积分记录查询', 'member:point:record:query', 3, 1, 2287, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-06-10 04:18:50', '', '2023-06-10 04:18:50', b'0');
1650   -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2293, '签到记录', '', 2, 3, 2300, 'sign-in-record', '', 'member/signin/record/index', 'SignInRecord', 0, b'1', b'1', b'1', '', '2023-06-10 04:48:22', '1', '2023-07-02 15:04:10', b'0');
1651   -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2294, '用户签到积分查询', 'member:point:sign-in-record:query', 3, 1, 2293, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-06-10 04:48:22', '', '2023-06-10 04:48:22', b'0');
1652   -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2299, '会员积分', '', 1, 1, 2262, 'point', '', '', '', 0, b'1', b'1', b'1', '1', '2023-06-27 22:48:51', '1', '2023-06-27 22:48:51', b'0');
1653   -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2300, '会员签到', '', 1, 2, 2262, 'signin', '', '', '', 0, b'1', b'1', b'1', '1', '2023-06-27 22:49:53', '1', '2023-06-27 22:49:53', b'0');
  1805 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2262, '会员中心', '', 1, 55, 0, '/member', 'ep:bicycle', NULL, NULL, 0, b'1', b'1', b'1', '1', '2023-06-10 00:42:03', '1', '2023-08-20 09:23:56', b'0');
  1806 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2275, '积分配置', '', 2, 0, 2299, 'config', 'fa:archive', 'member/point/config/index', 'PointConfig', 0, b'1', b'1', b'1', '', '2023-06-10 02:07:44', '1', '2023-08-20 12:01:20', b'0');
  1807 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2276, '积分设置查询', 'point:config:query', 3, 1, 2275, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-06-10 02:07:44', '', '2023-06-10 02:07:44', b'0');
  1808 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2277, '积分设置创建', 'point:config:save', 3, 2, 2275, '', '', '', '', 0, b'1', b'1', b'1', '', '2023-06-10 02:07:44', '1', '2023-06-27 20:32:31', b'0');
  1809 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2281, '签到配置', '', 2, 2, 2300, 'config', 'ep:calendar', 'member/signin/config/index', 'SignInConfig', 0, b'1', b'1', b'1', '', '2023-06-10 03:26:12', '1', '2023-08-20 19:25:51', b'0');
  1810 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2282, '积分签到规则查询', 'point:sign-in-config:query', 3, 1, 2281, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-06-10 03:26:12', '', '2023-06-10 03:26:12', b'0');
  1811 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2283, '积分签到规则创建', 'point:sign-in-config:create', 3, 2, 2281, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-06-10 03:26:12', '', '2023-06-10 03:26:12', b'0');
  1812 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2284, '积分签到规则更新', 'point:sign-in-config:update', 3, 3, 2281, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-06-10 03:26:12', '', '2023-06-10 03:26:12', b'0');
  1813 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2285, '积分签到规则删除', 'point:sign-in-config:delete', 3, 4, 2281, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-06-10 03:26:12', '', '2023-06-10 03:26:12', b'0');
  1814 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2287, '积分记录', '', 2, 1, 2299, 'record', 'fa:asterisk', 'member/point/record/index', 'PointRecord', 0, b'1', b'1', b'1', '', '2023-06-10 04:18:50', '1', '2023-08-20 12:01:42', b'0');
  1815 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2288, '用户积分记录查询', 'point:record:query', 3, 1, 2287, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-06-10 04:18:50', '', '2023-06-10 04:18:50', b'0');
  1816 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2293, '签到记录', '', 2, 3, 2300, 'record', 'ep:chicken', 'member/signin/record/index', 'SignInRecord', 0, b'1', b'1', b'1', '', '2023-06-10 04:48:22', '1', '2023-08-20 19:26:02', b'0');
  1817 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2294, '用户签到积分查询', 'point:sign-in-record:query', 3, 1, 2293, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-06-10 04:48:22', '', '2023-06-10 04:48:22', b'0');
  1818 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2297, '用户签到积分删除', 'point:sign-in-record:delete', 3, 4, 2293, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-06-10 04:48:22', '', '2023-06-10 04:48:22', b'0');
  1819 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2299, '会员积分', '', 1, 10, 2262, 'point', 'ep:pointer', '', '', 0, b'1', b'1', b'1', '1', '2023-06-27 22:48:51', '1', '2023-08-20 09:23:35', b'0');
  1820 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2300, '会员签到', '', 1, 11, 2262, 'signin', 'ep:alarm-clock', '', '', 0, b'1', b'1', b'1', '1', '2023-06-27 22:49:53', '1', '2023-08-20 09:23:48', b'0');
1654 1821 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2301, '回调通知', '', 2, 4, 1117, 'notify', 'example', 'pay/notify/index', 'PayNotify', 0, b'1', b'1', b'1', '', '2023-07-20 04:41:32', '1', '2023-07-20 13:45:08', b'0');
1655 1822 INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2302, '支付通知查询', 'pay:notify:query', 3, 1, 2301, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-07-20 04:41:32', '', '2023-07-20 04:41:32', b'0');
  1823 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2303, '拼团活动', '', 2, 3, 2030, 'combination', 'fa:group', '', '', 0, b'1', b'1', b'1', '1', '2023-08-12 17:19:54', '1', '2023-08-12 17:20:05', b'0');
  1824 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2304, '拼团商品', '', 2, 1, 2303, 'acitivity', 'ep:apple', 'mall/promotion/combination/activity/index', 'PromotionCombinationActivity', 0, b'1', b'1', b'1', '1', '2023-08-12 17:22:03', '1', '2023-08-12 17:22:29', b'0');
  1825 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2305, '拼团活动查询', 'promotion:combination-activity:query ', 3, 1, 2304, '', '', '', '', 0, b'1', b'1', b'1', '1', '2023-08-12 17:54:32', '1', '2023-08-12 17:54:32', b'0');
  1826 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2306, '拼团活动创建', 'promotion:combination-activity:create', 3, 2, 2304, '', '', '', '', 0, b'1', b'1', b'1', '1', '2023-08-12 17:54:49', '1', '2023-08-12 17:54:49', b'0');
  1827 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2307, '拼团活动更新', 'promotion:combination-activity:update', 3, 3, 2304, '', '', '', '', 0, b'1', b'1', b'1', '1', '2023-08-12 17:55:04', '1', '2023-08-12 17:55:04', b'0');
  1828 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2308, '拼团活动删除', 'promotion:combination-activity:delete', 3, 4, 2304, '', '', '', '', 0, b'1', b'1', b'1', '1', '2023-08-12 17:55:23', '1', '2023-08-12 17:55:23', b'0');
  1829 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2309, '秒杀活动关闭', 'promotion:combination-activity:close ', 3, 5, 2304, '', '', '', '', 0, b'1', b'1', b'1', '1', '2023-08-12 17:55:37', '1', '2023-08-12 17:55:37', b'0');
  1830 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2310, '砍价活动', '', 2, 4, 2030, 'bargain', 'ep:box', '', '', 0, b'1', b'1', b'1', '1', '2023-08-13 00:27:25', '1', '2023-08-13 00:27:25', b'0');
  1831 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2311, '砍价商品', '', 2, 1, 2310, 'bargain', 'ep:burger', 'mall/promotion/bargain/activity/index', 'PromotionBargainActivity', 0, b'1', b'1', b'1', '1', '2023-08-13 00:28:49', '1', '2023-08-13 00:28:49', b'0');
  1832 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2312, '砍价活动查询', 'promotion:bargain-activity:query', 3, 1, 2311, '', '', '', '', 0, b'1', b'1', b'1', '1', '2023-08-13 00:32:30', '1', '2023-08-13 00:32:30', b'0');
  1833 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2313, '砍价活动创建', 'promotion:bargain-activity:create', 3, 2, 2311, '', '', '', '', 0, b'1', b'1', b'1', '1', '2023-08-13 00:32:44', '1', '2023-08-13 00:32:44', b'0');
  1834 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2314, '砍价活动更新', 'promotion:bargain-activity:update', 3, 3, 2311, '', '', '', '', 0, b'1', b'1', b'1', '1', '2023-08-13 00:32:55', '1', '2023-08-13 00:32:55', b'0');
  1835 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2315, '砍价活动删除', 'promotion:bargain-activity:delete', 3, 4, 2311, '', '', '', '', 0, b'1', b'1', b'1', '1', '2023-08-13 00:34:50', '1', '2023-08-13 00:34:50', b'0');
  1836 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2316, '砍价活动关闭', 'promotion:bargain-activity:close', 3, 5, 2311, '', '', '', '', 0, b'1', b'1', b'1', '1', '2023-08-13 00:35:02', '1', '2023-08-13 00:35:02', b'0');
  1837 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2317, '会员管理', '', 2, 0, 2262, 'user', 'ep:avatar', 'member/user/index', 'MemberUser', 0, b'1', b'1', b'1', '', '2023-08-19 04:12:15', '1', '2023-08-19 12:13:06', b'0');
  1838 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2318, '会员用户查询', 'member:user:query', 3, 1, 2317, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-08-19 04:12:15', '', '2023-08-19 04:12:15', b'0');
  1839 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2319, '会员用户更新', 'member:user:update', 3, 3, 2317, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-08-19 04:12:15', '', '2023-08-19 04:12:15', b'0');
  1840 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2320, '会员标签', '', 2, 1, 2262, 'tag', 'ep:collection-tag', 'member/tag/index', 'MemberTag', 0, b'1', b'1', b'1', '', '2023-08-20 01:03:08', '1', '2023-08-20 09:23:19', b'0');
  1841 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2321, '会员标签查询', 'member:tag:query', 3, 1, 2320, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-08-20 01:03:08', '', '2023-08-20 01:03:08', b'0');
  1842 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2322, '会员标签创建', 'member:tag:create', 3, 2, 2320, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-08-20 01:03:08', '', '2023-08-20 01:03:08', b'0');
  1843 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2323, '会员标签更新', 'member:tag:update', 3, 3, 2320, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-08-20 01:03:08', '', '2023-08-20 01:03:08', b'0');
  1844 +INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2324, '会员标签删除', 'member:tag:delete', 3, 4, 2320, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-08-20 01:03:08', '', '2023-08-20 01:03:08', b'0');
1656 1845 COMMIT;
1657 1846  
1658 1847 -- ----------------------------
... ... @@ -1769,7 +1958,7 @@ CREATE TABLE `system_oauth2_access_token` (
1769 1958 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
1770 1959 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
1771 1960 PRIMARY KEY (`id`) USING BTREE
1772   -) ENGINE = InnoDB AUTO_INCREMENT = 2231 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OAuth2 访问令牌';
  1961 +) ENGINE = InnoDB AUTO_INCREMENT = 2453 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OAuth2 访问令牌';
1773 1962  
1774 1963 -- ----------------------------
1775 1964 -- Records of system_oauth2_access_token
... ... @@ -1891,7 +2080,7 @@ CREATE TABLE `system_oauth2_refresh_token` (
1891 2080 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
1892 2081 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
1893 2082 PRIMARY KEY (`id`) USING BTREE
1894   -) ENGINE = InnoDB AUTO_INCREMENT = 804 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OAuth2 刷新令牌';
  2083 +) ENGINE = InnoDB AUTO_INCREMENT = 850 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OAuth2 刷新令牌';
1895 2084  
1896 2085 -- ----------------------------
1897 2086 -- Records of system_oauth2_refresh_token
... ... @@ -1931,7 +2120,7 @@ CREATE TABLE `system_operate_log` (
1931 2120 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
1932 2121 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
1933 2122 PRIMARY KEY (`id`) USING BTREE
1934   -) ENGINE = InnoDB AUTO_INCREMENT = 7134 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '操作日志记录';
  2123 +) ENGINE = InnoDB AUTO_INCREMENT = 8043 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '操作日志记录';
1935 2124  
1936 2125 -- ----------------------------
1937 2126 -- Records of system_operate_log
... ... @@ -1989,7 +2178,7 @@ CREATE TABLE `system_role` (
1989 2178 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
1990 2179 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
1991 2180 PRIMARY KEY (`id`) USING BTREE
1992   -) ENGINE = InnoDB AUTO_INCREMENT = 139 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '角色信息表';
  2181 +) ENGINE = InnoDB AUTO_INCREMENT = 140 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '角色信息表';
1993 2182  
1994 2183 -- ----------------------------
1995 2184 -- Records of system_role
... ... @@ -1997,7 +2186,7 @@ CREATE TABLE `system_role` (
1997 2186 BEGIN;
1998 2187 INSERT INTO `system_role` (`id`, `name`, `code`, `sort`, `data_scope`, `data_scope_dept_ids`, `status`, `type`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, '超级管理员', 'super_admin', 1, 1, '', 0, 1, '超级管理员', 'admin', '2021-01-05 17:03:48', '', '2022-02-22 05:08:21', b'0', 1);
1999 2188 INSERT INTO `system_role` (`id`, `name`, `code`, `sort`, `data_scope`, `data_scope_dept_ids`, `status`, `type`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2, '普通角色', 'common', 2, 2, '', 0, 1, '普通角色', 'admin', '2021-01-05 17:03:48', '', '2022-02-22 05:08:20', b'0', 1);
2000   -INSERT INTO `system_role` (`id`, `name`, `code`, `sort`, `data_scope`, `data_scope_dept_ids`, `status`, `type`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (101, '测试账号', 'test', 0, 1, '[]', 0, 2, '132', '', '2021-01-06 13:49:35', '1', '2022-09-25 12:09:38', b'0', 1);
  2189 +INSERT INTO `system_role` (`id`, `name`, `code`, `sort`, `data_scope`, `data_scope_dept_ids`, `status`, `type`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (101, '测试账号', 'test', 0, 1, '[]', 0, 2, '132', '', '2021-01-06 13:49:35', '1', '2023-07-25 23:53:32', b'0', 1);
2001 2190 INSERT INTO `system_role` (`id`, `name`, `code`, `sort`, `data_scope`, `data_scope_dept_ids`, `status`, `type`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (109, '租户管理员', 'tenant_admin', 0, 1, '', 0, 1, '系统自动生成', '1', '2022-02-22 00:56:14', '1', '2022-02-22 00:56:14', b'0', 121);
2002 2191 INSERT INTO `system_role` (`id`, `name`, `code`, `sort`, `data_scope`, `data_scope_dept_ids`, `status`, `type`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (110, '测试角色', 'test', 0, 1, '[]', 0, 2, '嘿嘿', '110', '2022-02-23 00:14:34', '110', '2022-02-23 13:14:58', b'0', 121);
2003 2192 INSERT INTO `system_role` (`id`, `name`, `code`, `sort`, `data_scope`, `data_scope_dept_ids`, `status`, `type`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (111, '租户管理员', 'tenant_admin', 0, 1, '', 0, 1, '系统自动生成', '1', '2022-03-07 21:37:58', '1', '2022-03-07 21:37:58', b'0', 122);
... ... @@ -2009,6 +2198,7 @@ INSERT INTO `system_role` (`id`, `name`, `code`, `sort`, `data_scope`, `data_sco
2009 2198 INSERT INTO `system_role` (`id`, `name`, `code`, `sort`, `data_scope`, `data_scope_dept_ids`, `status`, `type`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (136, '租户管理员', 'tenant_admin', 0, 1, '', 0, 1, '系统自动生成', '1', '2023-03-05 21:23:32', '1', '2023-03-05 21:23:32', b'0', 147);
2010 2199 INSERT INTO `system_role` (`id`, `name`, `code`, `sort`, `data_scope`, `data_scope_dept_ids`, `status`, `type`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (137, '租户管理员', 'tenant_admin', 0, 1, '', 0, 1, '系统自动生成', '1', '2023-03-05 21:42:27', '1', '2023-03-05 21:42:27', b'0', 148);
2011 2200 INSERT INTO `system_role` (`id`, `name`, `code`, `sort`, `data_scope`, `data_scope_dept_ids`, `status`, `type`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (138, '租户管理员', 'tenant_admin', 0, 1, '', 0, 1, '系统自动生成', '1', '2023-03-05 21:59:02', '1', '2023-03-05 21:59:02', b'0', 149);
  2201 +INSERT INTO `system_role` (`id`, `name`, `code`, `sort`, `data_scope`, `data_scope_dept_ids`, `status`, `type`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (139, '租户管理员', 'tenant_admin', 0, 1, '', 0, 1, '系统自动生成', '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
2012 2202 COMMIT;
2013 2203  
2014 2204 -- ----------------------------
... ... @@ -2026,7 +2216,7 @@ CREATE TABLE `system_role_menu` (
2026 2216 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
2027 2217 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
2028 2218 PRIMARY KEY (`id`) USING BTREE
2029   -) ENGINE = InnoDB AUTO_INCREMENT = 2873 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '角色和菜单关联表';
  2219 +) ENGINE = InnoDB AUTO_INCREMENT = 2901 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '角色和菜单关联表';
2030 2220  
2031 2221 -- ----------------------------
2032 2222 -- Records of system_role_menu
... ... @@ -2829,6 +3019,34 @@ INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_t
2829 3019 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2870, 138, 1018, '1', '2023-03-05 21:59:02', '1', '2023-03-05 21:59:02', b'0', 149);
2830 3020 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2871, 138, 1019, '1', '2023-03-05 21:59:02', '1', '2023-03-05 21:59:02', b'0', 149);
2831 3021 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2872, 138, 1020, '1', '2023-03-05 21:59:02', '1', '2023-03-05 21:59:02', b'0', 149);
  3022 +INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2873, 139, 1, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
  3023 +INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2874, 139, 1036, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
  3024 +INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2875, 139, 1037, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
  3025 +INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2876, 139, 1038, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
  3026 +INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2877, 139, 1039, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
  3027 +INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2878, 139, 100, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
  3028 +INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2879, 139, 101, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
  3029 +INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2880, 139, 1063, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
  3030 +INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2881, 139, 103, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
  3031 +INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2882, 139, 1064, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
  3032 +INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2883, 139, 1001, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
  3033 +INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2884, 139, 1065, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
  3034 +INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2885, 139, 1002, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
  3035 +INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2886, 139, 1003, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
  3036 +INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2887, 139, 107, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
  3037 +INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2888, 139, 1004, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
  3038 +INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2889, 139, 1005, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
  3039 +INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2890, 139, 1006, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
  3040 +INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2891, 139, 1007, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
  3041 +INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2892, 139, 1008, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
  3042 +INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2893, 139, 1009, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
  3043 +INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2894, 139, 1010, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
  3044 +INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2895, 139, 1011, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
  3045 +INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2896, 139, 1012, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
  3046 +INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2897, 139, 1017, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
  3047 +INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2898, 139, 1018, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
  3048 +INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2899, 139, 1019, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
  3049 +INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2900, 139, 1020, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
2832 3050 COMMIT;
2833 3051  
2834 3052 -- ----------------------------
... ... @@ -2910,7 +3128,7 @@ CREATE TABLE `system_sms_code` (
2910 3128 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
2911 3129 PRIMARY KEY (`id`) USING BTREE,
2912 3130 INDEX `idx_mobile`(`mobile` ASC) USING BTREE COMMENT '手机号'
2913   -) ENGINE = InnoDB AUTO_INCREMENT = 484 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '手机验证码';
  3131 +) ENGINE = InnoDB AUTO_INCREMENT = 500 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '手机验证码';
2914 3132  
2915 3133 -- ----------------------------
2916 3134 -- Records of system_sms_code
... ... @@ -2953,7 +3171,7 @@ CREATE TABLE `system_sms_log` (
2953 3171 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
2954 3172 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
2955 3173 PRIMARY KEY (`id`) USING BTREE
2956   -) ENGINE = InnoDB AUTO_INCREMENT = 349 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '短信日志';
  3174 +) ENGINE = InnoDB AUTO_INCREMENT = 364 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '短信日志';
2957 3175  
2958 3176 -- ----------------------------
2959 3177 -- Records of system_sms_log
... ... @@ -2983,7 +3201,7 @@ CREATE TABLE `system_sms_template` (
2983 3201 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
2984 3202 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
2985 3203 PRIMARY KEY (`id`) USING BTREE
2986   -) ENGINE = InnoDB AUTO_INCREMENT = 14 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '短信模板';
  3204 +) ENGINE = InnoDB AUTO_INCREMENT = 17 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '短信模板';
2987 3205  
2988 3206 -- ----------------------------
2989 3207 -- Records of system_sms_template
... ... @@ -2998,6 +3216,9 @@ INSERT INTO `system_sms_template` (`id`, `type`, `status`, `code`, `name`, `cont
2998 3216 INSERT INTO `system_sms_template` (`id`, `type`, `status`, `code`, `name`, `content`, `params`, `remark`, `api_template_id`, `channel_id`, `channel_code`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (10, 2, 0, 'bpm_process_instance_reject', '【工作流】流程被不通过', '您的流程被审批不通过：{processInstanceName}，原因：{reason}，查看链接：{detailUrl}', '[\"processInstanceName\",\"reason\",\"detailUrl\"]', NULL, 'suibian', 4, 'DEBUG_DING_TALK', '1', '2022-01-22 00:03:31', '1', '2022-05-01 12:33:14', b'0');
2999 3217 INSERT INTO `system_sms_template` (`id`, `type`, `status`, `code`, `name`, `content`, `params`, `remark`, `api_template_id`, `channel_id`, `channel_code`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (11, 2, 0, 'bpm_process_instance_approve', '【工作流】流程被通过', '您的流程被审批通过：{processInstanceName}，查看链接：{detailUrl}', '[\"processInstanceName\",\"detailUrl\"]', NULL, 'suibian', 4, 'DEBUG_DING_TALK', '1', '2022-01-22 00:04:31', '1', '2022-03-27 20:32:21', b'0');
3000 3218 INSERT INTO `system_sms_template` (`id`, `type`, `status`, `code`, `name`, `content`, `params`, `remark`, `api_template_id`, `channel_id`, `channel_code`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (12, 2, 0, 'demo', '演示模板', '我就是测试一下下', '[]', NULL, 'biubiubiu', 6, 'DEBUG_DING_TALK', '1', '2022-04-10 23:22:49', '1', '2023-03-24 23:45:07', b'0');
  3219 +INSERT INTO `system_sms_template` (`id`, `type`, `status`, `code`, `name`, `content`, `params`, `remark`, `api_template_id`, `channel_id`, `channel_code`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (14, 1, 0, 'user-update-mobile', '会员用户 - 修改手机', '您的验证码{code}，该验证码 5 分钟内有效，请勿泄漏于他人！', '[\"code\"]', '', 'null', 4, 'DEBUG_DING_TALK', '1', '2023-08-19 18:58:01', '1', '2023-08-19 11:34:04', b'0');
  3220 +INSERT INTO `system_sms_template` (`id`, `type`, `status`, `code`, `name`, `content`, `params`, `remark`, `api_template_id`, `channel_id`, `channel_code`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (15, 1, 0, 'user-update-password', '会员用户 - 修改密码', '您的验证码{code}，该验证码 5 分钟内有效，请勿泄漏于他人！', '[\"code\"]', '', 'null', 4, 'DEBUG_DING_TALK', '1', '2023-08-19 18:58:01', '1', '2023-08-19 11:34:18', b'0');
  3221 +INSERT INTO `system_sms_template` (`id`, `type`, `status`, `code`, `name`, `content`, `params`, `remark`, `api_template_id`, `channel_id`, `channel_code`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (16, 1, 0, 'user-reset-password', '会员用户 - 重置密码', '您的验证码{code}，该验证码 5 分钟内有效，请勿泄漏于他人！', '[\"code\"]', '', 'null', 4, 'DEBUG_DING_TALK', '1', '2023-08-19 18:58:01', '1', '2023-08-19 11:34:18', b'0');
3001 3222 COMMIT;
3002 3223  
3003 3224 -- ----------------------------
... ... @@ -3076,15 +3297,15 @@ CREATE TABLE `system_tenant` (
3076 3297 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
3077 3298 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
3078 3299 PRIMARY KEY (`id`) USING BTREE
3079   -) ENGINE = InnoDB AUTO_INCREMENT = 150 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '租户表';
  3300 +) ENGINE = InnoDB AUTO_INCREMENT = 151 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '租户表';
3080 3301  
3081 3302 -- ----------------------------
3082 3303 -- Records of system_tenant
3083 3304 -- ----------------------------
3084 3305 BEGIN;
3085 3306 INSERT INTO `system_tenant` (`id`, `name`, `contact_user_id`, `contact_name`, `contact_mobile`, `status`, `domain`, `package_id`, `expire_time`, `account_count`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1, '芋道源码', NULL, '芋艿', '17321315478', 0, 'https://www.iocoder.cn', 0, '2099-02-19 17:14:16', 9999, '1', '2021-01-05 17:03:47', '1', '2022-02-23 12:15:11', b'0');
3086   -INSERT INTO `system_tenant` (`id`, `name`, `contact_user_id`, `contact_name`, `contact_mobile`, `status`, `domain`, `package_id`, `expire_time`, `account_count`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (121, '小租户', 110, '小王2', '15601691300', 0, 'http://www.iocoder.cn', 111, '2024-03-11 00:00:00', 20, '1', '2022-02-22 00:56:14', '1', '2022-05-17 10:03:59', b'0');
3087   -INSERT INTO `system_tenant` (`id`, `name`, `contact_user_id`, `contact_name`, `contact_mobile`, `status`, `domain`, `package_id`, `expire_time`, `account_count`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (122, '测试租户', 113, '芋道', '15601691300', 0, 'https://www.iocoder.cn', 111, '2022-04-30 00:00:00', 50, '1', '2022-03-07 21:37:58', '1', '2023-04-15 09:17:54', b'0');
  3307 +INSERT INTO `system_tenant` (`id`, `name`, `contact_user_id`, `contact_name`, `contact_mobile`, `status`, `domain`, `package_id`, `expire_time`, `account_count`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (121, '小租户', 110, '小王2', '15601691300', 0, 'http://www.iocoder.cn', 111, '2024-03-11 00:00:00', 20, '1', '2022-02-22 00:56:14', '1', '2023-07-25 23:05:38', b'0');
  3308 +INSERT INTO `system_tenant` (`id`, `name`, `contact_user_id`, `contact_name`, `contact_mobile`, `status`, `domain`, `package_id`, `expire_time`, `account_count`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (122, '测试租户', 113, '芋道', '15601691300', 0, 'https://www.iocoder.cn', 111, '2022-04-30 00:00:00', 50, '1', '2022-03-07 21:37:58', '1', '2023-07-25 23:53:16', b'0');
3088 3309 COMMIT;
3089 3310  
3090 3311 -- ----------------------------
... ... @@ -3156,7 +3377,7 @@ CREATE TABLE `system_user_role` (
3156 3377 `deleted` bit(1) NULL DEFAULT b'0' COMMENT '是否删除',
3157 3378 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
3158 3379 PRIMARY KEY (`id`) USING BTREE
3159   -) ENGINE = InnoDB AUTO_INCREMENT = 31 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户和角色关联表';
  3380 +) ENGINE = InnoDB AUTO_INCREMENT = 32 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户和角色关联表';
3160 3381  
3161 3382 -- ----------------------------
3162 3383 -- Records of system_user_role
... ... @@ -3187,6 +3408,7 @@ INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_t
3187 3408 INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (28, 123, 136, '1', '2023-03-05 21:23:35', '1', '2023-03-05 21:23:35', b'0', 147);
3188 3409 INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (29, 124, 137, '1', '2023-03-05 21:42:27', '1', '2023-03-05 21:42:27', b'0', 148);
3189 3410 INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (30, 125, 138, '1', '2023-03-05 21:59:03', '1', '2023-03-05 21:59:03', b'0', 149);
  3411 +INSERT INTO `system_user_role` (`id`, `user_id`, `role_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (31, 126, 139, '1', '2023-07-25 23:06:04', '1', '2023-07-25 23:06:04', b'0', 150);
3190 3412 COMMIT;
3191 3413  
3192 3414 -- ----------------------------
... ... @@ -3216,13 +3438,13 @@ CREATE TABLE `system_users` (
3216 3438 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
3217 3439 PRIMARY KEY (`id`) USING BTREE,
3218 3440 UNIQUE INDEX `idx_username`(`username` ASC, `update_time` ASC, `tenant_id` ASC) USING BTREE
3219   -) ENGINE = InnoDB AUTO_INCREMENT = 126 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户信息表';
  3441 +) ENGINE = InnoDB AUTO_INCREMENT = 127 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户信息表';
3220 3442  
3221 3443 -- ----------------------------
3222 3444 -- Records of system_users
3223 3445 -- ----------------------------
3224 3446 BEGIN;
3225   -INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, 'admin', '$2a$10$mRMIYLDtRHlf6.9ipiqH1.Z.bh/R9dO9d5iHiGYPigi6r5KOoR2Wm', '芋道源码', '管理员', 103, '[1]', 'aoteman@126.com', '15612345678', 1, 'http://test.yudao.iocoder.cn/e1fdd7271685ec143a0900681606406621717a666ad0b2798b096df41422b32f.png', 0, '127.0.0.1', '2023-07-24 08:41:23', 'admin', '2021-01-05 17:03:47', NULL, '2023-07-24 08:41:23', b'0', 1);
  3447 +INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (1, 'admin', '$2a$10$mRMIYLDtRHlf6.9ipiqH1.Z.bh/R9dO9d5iHiGYPigi6r5KOoR2Wm', '芋道源码', '管理员', 103, '[1]', 'aoteman@126.com', '15612345678', 1, 'http://test.yudao.iocoder.cn/e1fdd7271685ec143a0900681606406621717a666ad0b2798b096df41422b32f.png', 0, '0:0:0:0:0:0:0:1', '2023-08-20 19:24:52', 'admin', '2021-01-05 17:03:47', NULL, '2023-08-20 19:24:52', b'0', 1);
3226 3448 INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (100, 'yudao', '$2a$10$11U48RhyJ5pSBYWSn12AD./ld671.ycSzJHbyrtpeoMeYiw31eo8a', '芋道', '不要吓我', 104, '[1]', 'yudao@iocoder.cn', '15601691300', 1, '', 1, '127.0.0.1', '2022-07-09 23:03:33', '', '2021-01-07 09:07:17', NULL, '2022-07-09 23:03:33', b'0', 1);
3227 3449 INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (103, 'yuanma', '$2a$10$YMpimV4T6BtDhIaA8jSW.u8UTGBeGhc/qwXP4oxoMr4mOw9.qttt6', '源码', NULL, 106, NULL, 'yuanma@iocoder.cn', '15601701300', 0, '', 0, '127.0.0.1', '2022-07-08 01:26:27', '', '2021-01-13 23:50:35', NULL, '2022-07-08 01:26:27', b'0', 1);
3228 3450 INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (104, 'test', '$2a$10$GP8zvqHB//TekuzYZSBYAuBQJiNq1.fxQVDYJ.uBCOnWCtDVKE4H6', '测试号', NULL, 107, '[1,2]', '111@qq.com', '15601691200', 1, '', 0, '127.0.0.1', '2022-05-28 15:43:17', '', '2021-01-21 02:13:53', NULL, '2022-07-09 09:00:33', b'0', 1);
... ... @@ -3238,13 +3460,6 @@ INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`,
3238 3460 INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (116, '15601691302', '$2a$10$L5C4S0U6adBWMvFv1Wwl4.DI/NwYS3WIfLj5Q.Naqr5II8CmqsDZ6', '小豆', NULL, NULL, NULL, '', '', 0, '', 0, '', NULL, '1', '2022-05-17 10:07:10', '1', '2022-05-17 10:07:10', b'0', 124);
3239 3461 INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (117, 'admin123', '$2a$10$WI8Gg/lpZQIrOEZMHqka7OdFaD4Nx.B/qY8ZGTTUKrOJwaHFqibaC', '测试号', '1111', 100, '[2]', '', '15601691234', 1, '', 0, '', NULL, '1', '2022-07-09 17:40:26', '1', '2022-07-09 17:40:26', b'0', 1);
3240 3462 INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (118, 'goudan', '$2a$10$Lrb71muL.s5/AFjQ2IHkzOFlAFwUToH.zQL7bnghvTDt/QptjGgF6', '狗蛋', NULL, 103, '[1]', '', '', 2, '', 0, '', NULL, '1', '2022-07-09 17:44:43', '1', '2022-12-31 17:29:13', b'0', 1);
3241   -INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (119, 'admin', '$2a$10$AheSOpxeWQYhEO/gGZhDz.oifdX5zt.kprWNHptPiiStUx4mXmHb.', '12', NULL, NULL, NULL, '', '', 0, '', 0, '', NULL, '1', '2022-12-30 11:32:04', '1', '2022-12-30 11:32:04', b'0', 125);
3242   -INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (120, 'admin', '$2a$10$D.xFtcgma/NJ3SyYlUj3bORcs0mwOD6Zu.4I7GCI/8/25/QSn4qJC', '12', NULL, NULL, NULL, '', '', 0, '', 0, '', NULL, '1', '2022-12-30 11:33:42', '1', '2022-12-30 11:33:42', b'0', 126);
3243   -INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (121, 'admin', '$2a$10$R2guBf7TyERjjW9lm0Pd0Osut6vt7NuH2Vx6fkOI5.VgSvJK2Xb82', '12', NULL, NULL, NULL, '', '', 0, '', 0, '', NULL, '1', '2022-12-30 11:33:49', '1', '2022-12-30 11:33:49', b'0', 127);
3244   -INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (122, 'admin', '$2a$10$pwxqUUza61HBgx3FTjp2d.Mc2UKalikXxP91wUdP4bFe7Hl.lfmeq', '12', NULL, NULL, NULL, '', '', 0, '', 0, '', NULL, '1', '2022-12-30 11:47:52', '1', '2022-12-30 11:47:52', b'0', 129);
3245   -INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (123, 'tudou', '$2a$10$m33ROHSPa9lshwQIaiVlFeoG1TZjCoQmfvExn4QWS8r5X59AEsTz2', '15601691234', NULL, NULL, NULL, '', '', 0, '', 0, '', NULL, '1', '2023-03-05 21:23:35', '1', '2023-03-05 21:23:35', b'0', 147);
3246   -INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (124, 'tudou', '$2a$10$1pzAJAEIRf/vYyMy8FTFiOzX40Q/NnozXixun/ExPZwv8A/CQkR4q', '15601691234', NULL, NULL, NULL, '', '', 0, '', 0, '', NULL, '1', '2023-03-05 21:42:27', '1', '2023-03-05 21:42:27', b'0', 148);
3247   -INSERT INTO `system_users` (`id`, `username`, `password`, `nickname`, `remark`, `dept_id`, `post_ids`, `email`, `mobile`, `sex`, `avatar`, `status`, `login_ip`, `login_date`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (125, 'admin', '$2a$10$E49momkI6Uf9v6pkfjoRP.dHzK4RjDIK39AWHz9eXRmqUR5sbJpoy', '秃头', NULL, NULL, NULL, '', '', 0, '', 0, '', NULL, '1', '2023-03-05 21:59:03', '1', '2023-03-05 21:59:03', b'0', 149);
3248 3463 COMMIT;
3249 3464  
3250 3465 SET FOREIGN_KEY_CHECKS = 1;
... ...
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
  View file @9d9638b
... ... @@ -17,7 +17,6 @@ public interface ErrorCodeConstants {
17 17 // ========== AUTH 模块 1004003000 ==========
18 18 ErrorCode AUTH_LOGIN_BAD_CREDENTIALS = new ErrorCode(1004003000, "登录失败，账号密码不正确");
19 19 ErrorCode AUTH_LOGIN_USER_DISABLED = new ErrorCode(1004003001, "登录失败，账号被禁用");
20   - ErrorCode AUTH_TOKEN_EXPIRED = new ErrorCode(1004003004, "Token 已经过期");
21 20 ErrorCode AUTH_THIRD_LOGIN_NOT_BIND = new ErrorCode(1004003005, "未绑定账号，需要进行绑定");
22 21 ErrorCode AUTH_WEIXIN_MINI_APP_PHONE_CODE_ERROR = new ErrorCode(1004003006, "获得手机号失败");
23 22 ErrorCode AUTH_MOBILE_USED = new ErrorCode(1004003007, "手机号已经被使用");
... ... @@ -25,21 +24,19 @@ public interface ErrorCodeConstants {
25 24 // ========== 用户收件地址 1004004000 ==========
26 25 ErrorCode ADDRESS_NOT_EXISTS = new ErrorCode(1004004000, "用户收件地址不存在");
27 26  
28   - //========== 用户积分 1004005000 ==========
29   -
30   - // TODO @xiaqing：错误码要分段；例如说这里，积分配置、积分记录、签到配置、签到记录；分成 4 段；
31   -
32   - ErrorCode SIGN_IN_CONFIG_NOT_EXISTS = new ErrorCode(1004005003, "签到天数规则不存在");
33   - ErrorCode SIGN_IN_CONFIG_EXISTS = new ErrorCode(1004005004, "签到天数规则已存在");
  27 + //========== 会员标签 1004006000 ==========
  28 + ErrorCode TAG_NOT_EXISTS = new ErrorCode(1004006000, "会员标签不存在");
  29 + ErrorCode TAG_NAME_EXISTS = new ErrorCode(1004006001, "会员标签已经存在");
34 30  
35   - ErrorCode RECORD_NOT_EXISTS = new ErrorCode( 1004005005, "用户积分记录不存在");
  31 + //========== 积分配置 1004007000 ==========
36 32  
37   - ErrorCode SIGN_IN_RECORD_NOT_EXISTS = new ErrorCode(1004005006, "用户签到积分不存在");
  33 + //========== 积分记录 1004008000 ==========
38 34  
  35 + //========== 签到配置 1004009000 ==========
  36 + ErrorCode SIGN_IN_CONFIG_NOT_EXISTS = new ErrorCode(1004009000, "签到天数规则不存在");
  37 + ErrorCode SIGN_IN_CONFIG_EXISTS = new ErrorCode(1004009001, "签到天数规则已存在");
39 38  
40   - //========== 会员标签 1004006000 ==========
41   - ErrorCode TAG_NOT_EXISTS = new ErrorCode(1004006000, "会员标签不存在");
42   - ErrorCode TAG_NAME_EXISTS = new ErrorCode(1004006001, "会员标签已经存在");
  39 + //========== 签到配置 1004010000 ==========
43 40  
44 41  
45 42 //========== 会员等级 1004007000 ==========
... ...
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/point/MemberPointBizTypeEnum.java 0 → 100644
  View file @9d9638b
  1 +package cn.iocoder.yudao.module.member.enums.point;
  2 +
  3 +import cn.iocoder.yudao.framework.common.core.IntArrayValuable;
  4 +import lombok.AllArgsConstructor;
  5 +import lombok.Getter;
  6 +
  7 +/**
  8 + * 会员积分的业务类型枚举
  9 + *
  10 + * @author 芋道源码
  11 + */
  12 +@AllArgsConstructor
  13 +@Getter
  14 +public enum MemberPointBizTypeEnum implements IntArrayValuable {
  15 +
  16 + SIGN(1, "签到"),
  17 + ORDER_BUY(10, "订单消费"),
  18 + ORDER_CANCEL(11, "订单取消"); // 退回积分
  19 +
  20 + /**
  21 + * 类型
  22 + */
  23 + private final Integer type;
  24 + /**
  25 + * 名字
  26 + */
  27 + private final String name;
  28 +
  29 + @Override
  30 + public int[] array() {
  31 + return new int[0];
  32 + }
  33 +
  34 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberExperienceLogController.java
  View file @9d9638b
... ... @@ -28,9 +28,7 @@ import java.util.List;
28 28 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
29 29 import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
30 30  
31   -/**
32   - * @author owen
33   - */
  31 +// TODO @疯狂：要不 Log 改成 Record，和 PointRecord 保持一致
34 32 @Tag(name = "管理后台 - 会员经验记录")
35 33 @RestController
36 34 @RequestMapping("/member/experience-log")
... ... @@ -40,6 +38,7 @@ public class MemberExperienceLogController {
40 38 @Resource
41 39 private MemberExperienceLogService experienceLogService;
42 40  
  41 + // TODO @疯狂：不允许删除经验哈
43 42 @DeleteMapping("/delete")
44 43 @Operation(summary = "删除会员经验记录")
45 44 @Parameter(name = "id", description = "编号", required = true)
... ... @@ -58,6 +57,7 @@ public class MemberExperienceLogController {
58 57 return success(MemberExperienceLogConvert.INSTANCE.convert(experienceLog));
59 58 }
60 59  
  60 + // TODO @疯狂：这个接口可以删除哈，应该用不到
61 61 @GetMapping("/list")
62 62 @Operation(summary = "获得会员经验记录列表")
63 63 @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
... ... @@ -75,6 +75,7 @@ public class MemberExperienceLogController {
75 75 return success(MemberExperienceLogConvert.INSTANCE.convertPage(pageResult));
76 76 }
77 77  
  78 + // TODO @疯狂：导出可以先不支持，场景不多
78 79 @GetMapping("/export-excel")
79 80 @Operation(summary = "导出会员经验记录 Excel")
80 81 @PreAuthorize("@ss.hasPermission('member:experience-log:export')")
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelController.java
  View file @9d9638b
... ... @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.member.controller.admin.level;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.*;
  5 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.*;
6 6 import cn.iocoder.yudao.module.member.convert.level.MemberLevelConvert;
7 7 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
8 8 import cn.iocoder.yudao.module.member.service.level.MemberLevelService;
... ... @@ -20,9 +20,6 @@ import java.util.List;
20 20  
21 21 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
22 22  
23   -/**
24   - * @author owen
25   - */
26 23 @Tag(name = "管理后台 - 会员等级")
27 24 @RestController
28 25 @RequestMapping("/member/level")
... ... @@ -65,6 +62,7 @@ public class MemberLevelController {
65 62 return success(MemberLevelConvert.INSTANCE.convert(level));
66 63 }
67 64  
  65 + // TODO @疯狂：这个应该用不到哈
68 66 @GetMapping("/list")
69 67 @Operation(summary = "获得会员等级列表")
70 68 @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
... ... @@ -83,6 +81,7 @@ public class MemberLevelController {
83 81 return success(MemberLevelConvert.INSTANCE.convertSimpleList(list));
84 82 }
85 83  
  84 + // TODO @疯狂：是不是不做分页，直接 list 就好啦；返回的时候，按照经验排序下哈；
86 85 @GetMapping("/page")
87 86 @Operation(summary = "获得会员等级分页")
88 87 @PreAuthorize("@ss.hasPermission('member:level:query')")
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/MemberLevelLogController.java
  View file @9d9638b
... ... @@ -28,9 +28,7 @@ import java.util.List;
28 28 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
29 29 import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
30 30  
31   -/**
32   - * @author owen
33   - */
  31 +// TODO @疯狂：是不是不用这个 controller；因为日志只是为了记录，db 可以查询、和审计即可，目前暂时不需要开放出来；
34 32 @Tag(name = "管理后台 - 会员等级记录")
35 33 @RestController
36 34 @RequestMapping("/member/level-log")
... ... @@ -40,6 +38,7 @@ public class MemberLevelLogController {
40 38 @Resource
41 39 private MemberLevelLogService levelLogService;
42 40  
  41 + // TODO @疯狂：这个不允许删除哈
43 42 @DeleteMapping("/delete")
44 43 @Operation(summary = "删除会员等级记录")
45 44 @Parameter(name = "id", description = "编号", required = true)
... ... @@ -58,6 +57,7 @@ public class MemberLevelLogController {
58 57 return success(MemberLevelLogConvert.INSTANCE.convert(levelLog));
59 58 }
60 59  
  60 + // TODO @疯狂：这个接口，应该没用
61 61 @GetMapping("/list")
62 62 @Operation(summary = "获得会员等级记录列表")
63 63 @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
... ... @@ -75,6 +75,7 @@ public class MemberLevelLogController {
75 75 return success(MemberLevelLogConvert.INSTANCE.convertPage(pageResult));
76 76 }
77 77  
  78 + // TODO @疯狂：导出可以去掉先
78 79 @GetMapping("/export-excel")
79 80 @Operation(summary = "导出会员等级记录 Excel")
80 81 @PreAuthorize("@ss.hasPermission('member:level-log:export')")
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/experience/MemberExperienceLogBaseVO.java
  View file @9d9638b
... ... @@ -38,7 +38,7 @@ public class MemberExperienceLogBaseVO {
38 38 @NotNull(message = "变更后的经验不能为空")
39 39 private Integer totalExperience;
40 40  
41   - @Schema(description = "描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "下单增加100经验")
  41 + @Schema(description = "描述", requiredMode = Schema.RequiredMode.REQUIRED, example = "下单增加 100 经验")
42 42 @NotNull(message = "描述不能为空")
43 43 private String description;
44 44  
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/MemberLevelBaseVO.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelBaseVO.java
  View file @9d9638b
1   -package cn.iocoder.yudao.module.member.controller.admin.level.vo;
  1 +package cn.iocoder.yudao.module.member.controller.admin.level.vo.level;
2 2  
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  4 +import cn.iocoder.yudao.framework.common.validation.InEnum;
3 5 import io.swagger.v3.oas.annotations.media.Schema;
4 6 import lombok.Data;
5 7 import org.hibernate.validator.constraints.Range;
... ... @@ -24,29 +26,30 @@ public class MemberLevelBaseVO {
24 26  
25 27 @Schema(description = "升级经验", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
26 28 @NotNull(message = "升级经验不能为空")
27   - @Positive(message = "升级经验必须大于0")
  29 + @Positive(message = "升级经验必须大于 0")
28 30 private Integer experience;
29 31  
30 32 @Schema(description = "等级", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
31 33 @NotNull(message = "等级不能为空")
32   - @Positive(message = "等级必须大于0")
  34 + @Positive(message = "等级必须大于 0")
33 35 private Integer level;
34 36  
35 37 @Schema(description = "享受折扣", requiredMode = Schema.RequiredMode.REQUIRED, example = "98")
36 38 @NotNull(message = "享受折扣不能为空")
37   - @Range(min = 0, max = 100, message = "享受折扣的范围为0-100")
  39 + @Range(min = 0, max = 100, message = "享受折扣的范围为 0-100")
38 40 private Integer discount;
39 41  
40 42 @Schema(description = "等级图标", example = "https://www.iocoder.cn/yudao.jpg")
41   - @URL(message = "等级图标 必须是 URL 格式")
  43 + @URL(message = "等级图标必须是 URL 格式")
42 44 private String icon;
43 45  
44 46 @Schema(description = "等级背景图", example = "https://www.iocoder.cn/yudao.jpg")
45   - @URL(message = "等级背景图 必须是 URL 格式")
  47 + @URL(message = "等级背景图必须是 URL 格式")
46 48 private String backgroundUrl;
47 49  
48 50 @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
49 51 @NotNull(message = "状态不能为空")
  52 + @InEnum(CommonStatusEnum.class)
50 53 private Integer status;
51 54  
52 55 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/MemberLevelCreateReqVO.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelCreateReqVO.java
  View file @9d9638b
1   -package cn.iocoder.yudao.module.member.controller.admin.level.vo;
  1 +package cn.iocoder.yudao.module.member.controller.admin.level.vo.level;
2 2  
3 3 import io.swagger.v3.oas.annotations.media.Schema;
4 4 import lombok.Data;
5 5 import lombok.EqualsAndHashCode;
6 6 import lombok.ToString;
7 7  
  8 +// TODO @疯狂：项目的 vo 和 controller 不写 author 信息哈，只写 swagger 注解
8 9 /**
9 10 * @author owen
10 11 */
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/MemberLevelPageReqVO.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelPageReqVO.java
  View file @9d9638b
1   -package cn.iocoder.yudao.module.member.controller.admin.level.vo;
  1 +package cn.iocoder.yudao.module.member.controller.admin.level.vo.level;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 4 import io.swagger.v3.oas.annotations.media.Schema;
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/MemberLevelRespVO.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelRespVO.java
  View file @9d9638b
1   -package cn.iocoder.yudao.module.member.controller.admin.level.vo;
  1 +package cn.iocoder.yudao.module.member.controller.admin.level.vo.level;
2 2  
3 3 import io.swagger.v3.oas.annotations.media.Schema;
4 4 import lombok.Data;
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/MemberLevelSimpleRespVO.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelSimpleRespVO.java
  View file @9d9638b
1   -package cn.iocoder.yudao.module.member.controller.admin.level.vo;
  1 +package cn.iocoder.yudao.module.member.controller.admin.level.vo.level;
2 2  
3 3 import io.swagger.v3.oas.annotations.media.Schema;
4 4 import lombok.Data;
5 5 import lombok.ToString;
6 6  
7   -/**
8   - * @author owen
9   - */
  7 +// TODO @疯狂：不需要继承 MemberLevelBaseVO
10 8 @Schema(description = "管理后台 - 会员等级 Response VO")
11 9 @Data
12 10 @ToString(callSuper = true)
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/MemberLevelUpdateReqVO.java renamed to yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/level/vo/level/MemberLevelUpdateReqVO.java
  View file @9d9638b
1   -package cn.iocoder.yudao.module.member.controller.admin.level.vo;
  1 +package cn.iocoder.yudao.module.member.controller.admin.level.vo.level;
2 2  
3 3 import io.swagger.v3.oas.annotations.media.Schema;
4 4 import lombok.Data;
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/MemberPointConfigController.java
  View file @9d9638b
... ... @@ -29,16 +29,16 @@ public class MemberPointConfigController {
29 29 @PutMapping("/save")
30 30 @Operation(summary = "保存会员积分配置")
31 31 @PreAuthorize("@ss.hasPermission('point:config:save')")
32   - public CommonResult<Boolean> updateConfig(@Valid @RequestBody MemberPointConfigSaveReqVO saveReqVO) {
33   - memberPointConfigService.saveConfig(saveReqVO);
  32 + public CommonResult<Boolean> savePointConfig(@Valid @RequestBody MemberPointConfigSaveReqVO saveReqVO) {
  33 + memberPointConfigService.savePointConfig(saveReqVO);
34 34 return success(true);
35 35 }
36 36  
37 37 @GetMapping("/get")
38 38 @Operation(summary = "获得会员积分配置")
39 39 @PreAuthorize("@ss.hasPermission('point:config:query')")
40   - public CommonResult<MemberPointConfigRespVO> getConfig() {
41   - MemberPointConfigDO config = memberPointConfigService.getConfig();
  40 + public CommonResult<MemberPointConfigRespVO> getPointConfig() {
  41 + MemberPointConfigDO config = memberPointConfigService.getPointConfig();
42 42 return success(MemberPointConfigConvert.INSTANCE.convert(config));
43 43 }
44 44  
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/MemberPointRecordController.java
  View file @9d9638b
... ... @@ -25,6 +25,7 @@ import java.util.List;
25 25 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
26 26 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
27 27  
  28 +@Tag(name = "管理后台 - 签到记录")
28 29 @RestController
29 30 @RequestMapping("/member/point/record")
30 31 @Validated
... ... @@ -39,9 +40,9 @@ public class MemberPointRecordController {
39 40 @GetMapping("/page")
40 41 @Operation(summary = "获得用户积分记录分页")
41 42 @PreAuthorize("@ss.hasPermission('point:record:query')")
42   - public CommonResult<PageResult<MemberPointRecordRespVO>> getRecordPage(@Valid MemberPointRecordPageReqVO pageVO) {
  43 + public CommonResult<PageResult<MemberPointRecordRespVO>> getPointRecordPage(@Valid MemberPointRecordPageReqVO pageVO) {
43 44 // 执行分页查询
44   - PageResult<MemberPointRecordDO> pageResult = pointRecordService.getRecordPage(pageVO);
  45 + PageResult<MemberPointRecordDO> pageResult = pointRecordService.getPointRecordPage(pageVO);
45 46 if (CollectionUtils.isEmpty(pageResult.getList())) {
46 47 return success(PageResult.empty(pageResult.getTotal()));
47 48 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/vo/recrod/MemberPointRecordPageReqVO.java
  View file @9d9638b
... ... @@ -16,12 +16,9 @@ public class MemberPointRecordPageReqVO extends PageParam {
16 16 private String nickname;
17 17  
18 18 @Schema(description = "业务类型", example = "1")
19   - private String bizType;
  19 + private Integer bizType;
20 20  
21 21 @Schema(description = "积分标题", example = "呵呵")
22 22 private String title;
23 23  
24   - @Schema(description = "积分状态", example = "1")
25   - private Integer status;
26   -
27 24 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/point/vo/recrod/MemberPointRecordRespVO.java
  View file @9d9638b
1 1 package cn.iocoder.yudao.module.member.controller.admin.point.vo.recrod;
2 2  
3 3 import io.swagger.v3.oas.annotations.media.Schema;
4   -import lombok.*;
5   -import org.springframework.format.annotation.DateTimeFormat;
  4 +import lombok.Data;
6 5  
7   -import javax.validation.constraints.NotNull;
8 6 import java.time.LocalDateTime;
9 7  
10   -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
11   -
12 8 @Schema(description = "管理后台 - 用户积分记录 Response VO")
13 9 @Data
14 10 public class MemberPointRecordRespVO {
... ... @@ -26,7 +22,7 @@ public class MemberPointRecordRespVO {
26 22 private String bizId;
27 23  
28 24 @Schema(description = "业务类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
29   - private String bizType;
  25 + private Integer bizType;
30 26  
31 27 @Schema(description = "积分标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
32 28 private String title;
... ... @@ -40,17 +36,6 @@ public class MemberPointRecordRespVO {
40 36 @Schema(description = "变动后的积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "200")
41 37 private Integer totalPoint;
42 38  
43   - @Schema(description = "积分状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
44   - private Integer status;
45   -
46   - @Schema(description = "冻结时间")
47   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
48   - private LocalDateTime freezingTime;
49   -
50   - @Schema(description = "解冻时间")
51   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
52   - private LocalDateTime thawingTime;
53   -
54 39 @Schema(description = "发生时间", requiredMode = Schema.RequiredMode.REQUIRED)
55 40 private LocalDateTime createTime;
56 41  
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/signin/MemberSignInConfigController.java
  View file @9d9638b
... ... @@ -20,9 +20,10 @@ import java.util.List;
20 20  
21 21 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
22 22  
23   -@Tag(name = "管理后台 - 积分签到规则")
  23 +// TODO 芋艿：url
  24 +@Tag(name = "管理后台 - 签到规则")
24 25 @RestController
25   -@RequestMapping("/member/point/sign-in-config")
  26 +@RequestMapping("/member/sign-in/config")
26 27 @Validated
27 28 public class MemberSignInConfigController {
28 29  
... ... @@ -30,14 +31,14 @@ public class MemberSignInConfigController {
30 31 private MemberSignInConfigService signInConfigService;
31 32  
32 33 @PostMapping("/create")
33   - @Operation(summary = "创建积分签到规则")
  34 + @Operation(summary = "创建签到规则")
34 35 @PreAuthorize("@ss.hasPermission('point:sign-in-config:create')")
35 36 public CommonResult<Long> createSignInConfig(@Valid @RequestBody MemberSignInConfigCreateReqVO createReqVO) {
36 37 return success(signInConfigService.createSignInConfig(createReqVO));
37 38 }
38 39  
39 40 @PutMapping("/update")
40   - @Operation(summary = "更新积分签到规则")
  41 + @Operation(summary = "更新签到规则")
41 42 @PreAuthorize("@ss.hasPermission('point:sign-in-config:update')")
42 43 public CommonResult<Boolean> updateSignInConfig(@Valid @RequestBody MemberSignInConfigUpdateReqVO updateReqVO) {
43 44 signInConfigService.updateSignInConfig(updateReqVO);
... ... @@ -45,7 +46,7 @@ public class MemberSignInConfigController {
45 46 }
46 47  
47 48 @DeleteMapping("/delete")
48   - @Operation(summary = "删除积分签到规则")
  49 + @Operation(summary = "删除签到规则")
49 50 @Parameter(name = "id", description = "编号", required = true)
50 51 @PreAuthorize("@ss.hasPermission('point:sign-in-config:delete')")
51 52 public CommonResult<Boolean> deleteSignInConfig(@RequestParam("id") Long id) {
... ... @@ -54,7 +55,7 @@ public class MemberSignInConfigController {
54 55 }
55 56  
56 57 @GetMapping("/get")
57   - @Operation(summary = "获得积分签到规则")
  58 + @Operation(summary = "获得签到规则")
58 59 @Parameter(name = "id", description = "编号", required = true, example = "1024")
59 60 @PreAuthorize("@ss.hasPermission('point:sign-in-config:query')")
60 61 public CommonResult<MemberSignInConfigRespVO> getSignInConfig(@RequestParam("id") Long id) {
... ... @@ -63,11 +64,11 @@ public class MemberSignInConfigController {
63 64 }
64 65  
65 66 @GetMapping("/list")
66   - @Operation(summary = "获得积分签到规则分页")
  67 + @Operation(summary = "获得签到规则列表")
67 68 @PreAuthorize("@ss.hasPermission('point:sign-in-config:query')")
68 69 public CommonResult<List<MemberSignInConfigRespVO>> getSignInConfigList() {
69   - List<MemberSignInConfigDO> pageResult = signInConfigService.getSignInConfigList();
70   - return success(MemberSignInConfigConvert.INSTANCE.convertList(pageResult));
  70 + List<MemberSignInConfigDO> list = signInConfigService.getSignInConfigList();
  71 + return success(MemberSignInConfigConvert.INSTANCE.convertList(list));
71 72 }
72 73  
73 74 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/signin/MemberSignInRecordController.java
  View file @9d9638b
... ... @@ -25,9 +25,9 @@ import java.util.List;
25 25 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
26 26 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
27 27  
28   -@Tag(name = "管理后台 - 用户签到积分")
  28 +@Tag(name = "管理后台 - 签到记录")
29 29 @RestController
30   -@RequestMapping("/member/point/sign-in-record")
  30 +@RequestMapping("/member/sign-in/record")
31 31 @Validated
32 32 public class MemberSignInRecordController {
33 33  
... ... @@ -38,7 +38,7 @@ public class MemberSignInRecordController {
38 38 private MemberUserApi memberUserApi;
39 39  
40 40 @GetMapping("/page")
41   - @Operation(summary = "获得用户签到积分分页")
  41 + @Operation(summary = "获得签到记录分页")
42 42 @PreAuthorize("@ss.hasPermission('point:sign-in-record:query')")
43 43 public CommonResult<PageResult<MemberSignInRecordRespVO>> getSignInRecordPage(@Valid MemberSignInRecordPageReqVO pageVO) {
44 44 // 执行分页查询
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/signin/vo/config/MemberSignInConfigBaseVO.java
  View file @9d9638b
1 1 package cn.iocoder.yudao.module.member.controller.admin.signin.vo.config;
2 2  
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  4 +import cn.iocoder.yudao.framework.common.validation.InEnum;
3 5 import io.swagger.v3.oas.annotations.media.Schema;
4 6 import lombok.Data;
5 7  
6 8 import javax.validation.constraints.NotNull;
7 9  
8 10 /**
9   - * 积分签到规则 Base VO，提供给添加、修改、详细的子 VO 使用
  11 + * 签到规则 Base VO，提供给添加、修改、详细的子 VO 使用
10 12 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
11 13 */
12 14 @Data
13 15 public class MemberSignInConfigBaseVO {
14   -
  16 +
15 17 @Schema(description = "签到第 x 天", requiredMode = Schema.RequiredMode.REQUIRED, example = "7")
16 18 @NotNull(message = "签到天数不能为空")
17 19 private Integer day;
... ... @@ -20,8 +22,9 @@ public class MemberSignInConfigBaseVO {
20 22 @NotNull(message = "奖励积分不能为空")
21 23 private Integer point;
22 24  
23   - @NotNull
24   - @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
25   - private Boolean enable;
  25 + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  26 + @NotNull(message = "状态不能为空")
  27 + @InEnum(CommonStatusEnum.class)
  28 + private Integer status;
26 29  
27 30 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/signin/vo/config/MemberSignInConfigCreateReqVO.java
  View file @9d9638b
... ... @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.member.controller.admin.signin.vo.config;
3 3 import lombok.*;
4 4 import io.swagger.v3.oas.annotations.media.Schema;
5 5  
6   -@Schema(description = "管理后台 - 积分签到规则创建 Request VO")
  6 +@Schema(description = "管理后台 - 签到规则创建 Request VO")
7 7 @Data
8 8 @EqualsAndHashCode(callSuper = true)
9 9 @ToString(callSuper = true)
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/signin/vo/config/MemberSignInConfigRespVO.java
  View file @9d9638b
... ... @@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
4 4 import lombok.*;
5 5 import java.time.LocalDateTime;
6 6  
7   -@Schema(description = "管理后台 - 积分签到规则 Response VO")
  7 +@Schema(description = "管理后台 - 签到规则 Response VO")
8 8 @Data
9 9 @EqualsAndHashCode(callSuper = true)
10 10 @ToString(callSuper = true)
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/signin/vo/config/MemberSignInConfigUpdateReqVO.java
  View file @9d9638b
... ... @@ -5,7 +5,7 @@ import lombok.*;
5 5  
6 6 import javax.validation.constraints.*;
7 7  
8   -@Schema(description = "管理后台 - 积分签到规则更新 Request VO")
  8 +@Schema(description = "管理后台 - 签到规则更新 Request VO")
9 9 @Data
10 10 @EqualsAndHashCode(callSuper = true)
11 11 @ToString(callSuper = true)
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/signin/vo/record/MemberSignInRecordPageReqVO.java
  View file @9d9638b
... ... @@ -11,7 +11,7 @@ import java.time.LocalDateTime;
11 11  
12 12 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
13 13  
14   -@Schema(description = "管理后台 - 用户签到积分分页 Request VO")
  14 +@Schema(description = "管理后台 - 签到记录分页 Request VO")
15 15 @Data
16 16 @EqualsAndHashCode(callSuper = true)
17 17 @ToString(callSuper = true)
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/signin/vo/record/MemberSignInRecordRespVO.java
  View file @9d9638b
... ... @@ -5,7 +5,7 @@ import lombok.Data;
5 5  
6 6 import java.time.LocalDateTime;
7 7  
8   -@Schema(description = "管理后台 - 用户签到积分 Response VO")
  8 +@Schema(description = "管理后台 - 签到记录 Response VO")
9 9 @Data
10 10 public class MemberSignInRecordRespVO {
11 11  
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/tag/MemberTagController.java
  View file @9d9638b
... ... @@ -69,7 +69,7 @@ public class MemberTagController {
69 69 @Operation(summary = "获取会员标签精简信息列表", description = "只包含被开启的会员标签，主要用于前端的下拉选项")
70 70 public CommonResult<List<MemberTagRespVO>> getSimpleTagList() {
71 71 // 获用户列表，只要开启状态的
72   - List<MemberTagDO> list = tagService.getList();
  72 + List<MemberTagDO> list = tagService.getTagList();
73 73 // 排序后，返回给前端
74 74 return success(MemberTagConvert.INSTANCE.convertList(list));
75 75 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/point/AppMemberPointRecordController.java 0 → 100644
  View file @9d9638b
  1 +package cn.iocoder.yudao.module.member.controller.app.point;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  4 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
  5 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  6 +import cn.iocoder.yudao.module.member.controller.app.point.vo.AppMemberPointRecordRespVO;
  7 +import cn.iocoder.yudao.module.member.convert.point.MemberPointRecordConvert;
  8 +import cn.iocoder.yudao.module.member.dal.dataobject.point.MemberPointRecordDO;
  9 +import cn.iocoder.yudao.module.member.service.point.MemberPointRecordService;
  10 +import io.swagger.v3.oas.annotations.Operation;
  11 +import io.swagger.v3.oas.annotations.tags.Tag;
  12 +import org.springframework.validation.annotation.Validated;
  13 +import org.springframework.web.bind.annotation.GetMapping;
  14 +import org.springframework.web.bind.annotation.RequestMapping;
  15 +import org.springframework.web.bind.annotation.RestController;
  16 +
  17 +import javax.annotation.Resource;
  18 +import javax.validation.Valid;
  19 +
  20 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  21 +import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
  22 +
  23 +@Tag(name = "用户 App - 签到记录")
  24 +@RestController
  25 +@RequestMapping("/member/point/record")
  26 +@Validated
  27 +public class AppMemberPointRecordController {
  28 +
  29 + @Resource
  30 + private MemberPointRecordService pointRecordService;
  31 +
  32 + @GetMapping("/page")
  33 + @Operation(summary = "获得用户积分记录分页")
  34 + public CommonResult<PageResult<AppMemberPointRecordRespVO>> getPointRecordPage(@Valid PageParam pageVO) {
  35 + PageResult<MemberPointRecordDO> pageResult = pointRecordService.getPointRecordPage(getLoginUserId(), pageVO);
  36 + return success(MemberPointRecordConvert.INSTANCE.convertPage02(pageResult));
  37 + }
  38 +
  39 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/point/vo/AppMemberPointRecordRespVO.java 0 → 100644
  View file @9d9638b
  1 +package cn.iocoder.yudao.module.member.controller.app.point.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import java.time.LocalDateTime;
  7 +
  8 +@Schema(description = "用户 App - 用户积分记录 Response VO")
  9 +@Data
  10 +public class AppMemberPointRecordRespVO {
  11 +
  12 + @Schema(description = "自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "31457")
  13 + private Long id;;
  14 +
  15 + @Schema(description = "积分标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
  16 + private String title;
  17 +
  18 + @Schema(description = "积分描述", example = "你猜")
  19 + private String description;
  20 +
  21 + @Schema(description = "积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
  22 + private Integer point;
  23 +
  24 + @Schema(description = "发生时间", requiredMode = Schema.RequiredMode.REQUIRED)
  25 + private LocalDateTime createTime;
  26 +
  27 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/signin/AppMemberSignInConfigController.java 0 → 100644
  View file @9d9638b
  1 +package cn.iocoder.yudao.module.member.controller.app.signin;
  2 +
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  4 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  5 +import cn.iocoder.yudao.module.member.controller.app.signin.vo.config.AppMemberSignInConfigRespVO;
  6 +import cn.iocoder.yudao.module.member.convert.signin.MemberSignInConfigConvert;
  7 +import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInConfigDO;
  8 +import cn.iocoder.yudao.module.member.service.signin.MemberSignInConfigService;
  9 +import io.swagger.v3.oas.annotations.Operation;
  10 +import io.swagger.v3.oas.annotations.tags.Tag;
  11 +import org.springframework.validation.annotation.Validated;
  12 +import org.springframework.web.bind.annotation.GetMapping;
  13 +import org.springframework.web.bind.annotation.RequestMapping;
  14 +import org.springframework.web.bind.annotation.RestController;
  15 +
  16 +import javax.annotation.Resource;
  17 +import java.util.List;
  18 +
  19 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  20 +
  21 +@Tag(name = "用户 App - 签到规则")
  22 +@RestController
  23 +@RequestMapping("/member/sign-in/config")
  24 +@Validated
  25 +public class AppMemberSignInConfigController {
  26 +
  27 + @Resource
  28 + private MemberSignInConfigService signInConfigService;
  29 +
  30 + @GetMapping("/list")
  31 + @Operation(summary = "获得签到规则列表")
  32 + public CommonResult<List<AppMemberSignInConfigRespVO>> getSignInConfigList() {
  33 + List<MemberSignInConfigDO> pageResult = signInConfigService.getSignInConfigList(CommonStatusEnum.ENABLE.getStatus());
  34 + return success(MemberSignInConfigConvert.INSTANCE.convertList02(pageResult));
  35 + }
  36 +
  37 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/signin/AppMemberSignInRecordController.java 0 → 100644
  View file @9d9638b
  1 +package cn.iocoder.yudao.module.member.controller.app.signin;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  4 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
  5 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  6 +import cn.iocoder.yudao.module.member.controller.app.signin.vo.record.AppMemberSignInRecordRespVO;
  7 +import cn.iocoder.yudao.module.member.controller.app.signin.vo.record.AppMemberSignInRecordSummaryRespVO;
  8 +import cn.iocoder.yudao.module.member.convert.signin.MemberSignInRecordConvert;
  9 +import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
  10 +import cn.iocoder.yudao.module.member.service.signin.MemberSignInRecordService;
  11 +import io.swagger.v3.oas.annotations.Operation;
  12 +import io.swagger.v3.oas.annotations.tags.Tag;
  13 +import org.springframework.validation.annotation.Validated;
  14 +import org.springframework.web.bind.annotation.GetMapping;
  15 +import org.springframework.web.bind.annotation.PostMapping;
  16 +import org.springframework.web.bind.annotation.RequestMapping;
  17 +import org.springframework.web.bind.annotation.RestController;
  18 +
  19 +import javax.annotation.Resource;
  20 +import java.time.LocalDateTime;
  21 +
  22 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  23 +import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
  24 +
  25 +@Tag(name = "管理后台 - 签到记录")
  26 +@RestController
  27 +@RequestMapping("/member/sign-in/record")
  28 +@Validated
  29 +public class AppMemberSignInRecordController {
  30 +
  31 + @Resource
  32 + private MemberSignInRecordService signInRecordService;
  33 +
  34 + // TODO 芋艿：临时 mock => UserSignController.getUserInfo
  35 + @GetMapping("/get-summary")
  36 + @Operation(summary = "获得个人签到统计")
  37 + public CommonResult<AppMemberSignInRecordSummaryRespVO> getSignInRecordSummary() {
  38 + AppMemberSignInRecordSummaryRespVO respVO = new AppMemberSignInRecordSummaryRespVO();
  39 + if (false) {
  40 + respVO.setTotalDay(100);
  41 + respVO.setContinuousDay(5);
  42 + respVO.setTodaySignIn(true);
  43 + } else {
  44 + respVO.setTotalDay(100);
  45 + respVO.setContinuousDay(10);
  46 + respVO.setTodaySignIn(false);
  47 + }
  48 + return success(respVO);
  49 + }
  50 +
  51 + // TODO 芋艿：临时 mock => UserSignController.info
  52 + @PostMapping("/create")
  53 + @Operation(summary = "签到")
  54 + public CommonResult<AppMemberSignInRecordRespVO> createSignInRecord() {
  55 + AppMemberSignInRecordRespVO respVO = new AppMemberSignInRecordRespVO()
  56 + .setPoint(10)
  57 + .setDay(10)
  58 + .setCreateTime(LocalDateTime.now());
  59 + return success(respVO);
  60 + }
  61 +
  62 + @GetMapping("/page")
  63 + @Operation(summary = "获得签到记录分页")
  64 + public CommonResult<PageResult<AppMemberSignInRecordRespVO>> getSignRecordPage(PageParam pageParam) {
  65 + PageResult<MemberSignInRecordDO> pageResult = signInRecordService.getSignRecordPage(getLoginUserId(), pageParam);
  66 + return success(MemberSignInRecordConvert.INSTANCE.convertPage02(pageResult));
  67 + }
  68 +
  69 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/signin/vo/config/AppMemberSignInConfigRespVO.java 0 → 100644
  View file @9d9638b
  1 +package cn.iocoder.yudao.module.member.controller.app.signin.vo.config;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +@Schema(description = "用户 App - 签到规则 Response VO")
  7 +@Data
  8 +public class AppMemberSignInConfigRespVO {
  9 +
  10 + @Schema(description = "签到第 x 天", requiredMode = Schema.RequiredMode.REQUIRED, example = "7")
  11 + private Integer day;
  12 +
  13 + @Schema(description = "奖励积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
  14 + private Integer point;
  15 +
  16 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/signin/vo/record/AppMemberSignInRecordRespVO.java 0 → 100644
  View file @9d9638b
  1 +package cn.iocoder.yudao.module.member.controller.app.signin.vo.record;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import java.time.LocalDateTime;
  7 +
  8 +@Schema(description = "用户 App - 签到记录 Response VO")
  9 +@Data
  10 +public class AppMemberSignInRecordRespVO {
  11 +
  12 + @Schema(description = "第几天签到", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  13 + private Integer day;
  14 +
  15 + @Schema(description = "签到的分数", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
  16 + private Integer point;
  17 +
  18 + @Schema(description = "签到时间", requiredMode = Schema.RequiredMode.REQUIRED)
  19 + private LocalDateTime createTime;
  20 +
  21 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/signin/vo/record/AppMemberSignInRecordSummaryRespVO.java 0 → 100644
  View file @9d9638b
  1 +package cn.iocoder.yudao.module.member.controller.app.signin.vo.record;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +@Schema(description = "用户 App - 个人签到统计 Response VO")
  7 +@Data
  8 +public class AppMemberSignInRecordSummaryRespVO {
  9 +
  10 + @Schema(description = "总签到天数", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
  11 + private Integer totalDay;
  12 +
  13 + @Schema(description = "连续签到第 x 天", requiredMode = Schema.RequiredMode.REQUIRED, example = "3")
  14 + private Integer continuousDay;
  15 +
  16 + @Schema(description = "今天是否已签到", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
  17 + private Boolean todaySignIn;
  18 +
  19 +}
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/level/MemberLevelConvert.java
  View file @9d9638b
1 1 package cn.iocoder.yudao.module.member.convert.level;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.MemberLevelCreateReqVO;
5   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.MemberLevelRespVO;
6   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.MemberLevelSimpleRespVO;
7   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.MemberLevelUpdateReqVO;
  4 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelCreateReqVO;
  5 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelRespVO;
  6 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelSimpleRespVO;
  7 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelUpdateReqVO;
8 8 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
9 9 import org.mapstruct.Mapper;
10 10 import org.mapstruct.factory.Mappers;
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/point/MemberPointRecordConvert.java
  View file @9d9638b
... ... @@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 4 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
5 5 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
6 6 import cn.iocoder.yudao.module.member.controller.admin.point.vo.recrod.MemberPointRecordRespVO;
  7 +import cn.iocoder.yudao.module.member.controller.app.point.vo.AppMemberPointRecordRespVO;
7 8 import cn.iocoder.yudao.module.member.dal.dataobject.point.MemberPointRecordDO;
8 9 import org.mapstruct.Mapper;
9 10 import org.mapstruct.factory.Mappers;
... ... @@ -33,4 +34,6 @@ public interface MemberPointRecordConvert {
33 34 }
34 35 PageResult<MemberPointRecordRespVO> convertPage(PageResult<MemberPointRecordDO> pageResult);
35 36  
  37 + PageResult<AppMemberPointRecordRespVO> convertPage02(PageResult<MemberPointRecordDO> pageResult);
  38 +
36 39 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/signin/MemberSignInConfigConvert.java
  View file @9d9638b
... ... @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.member.convert.signin;
3 3 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.config.MemberSignInConfigCreateReqVO;
4 4 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.config.MemberSignInConfigRespVO;
5 5 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.config.MemberSignInConfigUpdateReqVO;
  6 +import cn.iocoder.yudao.module.member.controller.app.signin.vo.config.AppMemberSignInConfigRespVO;
6 7 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInConfigDO;
7 8 import org.mapstruct.Mapper;
8 9 import org.mapstruct.factory.Mappers;
... ... @@ -10,7 +11,7 @@ import org.mapstruct.factory.Mappers;
10 11 import java.util.List;
11 12  
12 13 /**
13   - * 积分签到规则 Convert
  14 + * 签到规则 Convert
14 15 *
15 16 * @author QingX
16 17 */
... ... @@ -27,4 +28,6 @@ public interface MemberSignInConfigConvert {
27 28  
28 29 List<MemberSignInConfigRespVO> convertList(List<MemberSignInConfigDO> list);
29 30  
  31 + List<AppMemberSignInConfigRespVO> convertList02(List<MemberSignInConfigDO> list);
  32 +
30 33 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/signin/MemberSignInRecordConvert.java
  View file @9d9638b
... ... @@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 4 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
5 5 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
6 6 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordRespVO;
  7 +import cn.iocoder.yudao.module.member.controller.app.signin.vo.record.AppMemberSignInRecordRespVO;
7 8 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
8 9 import org.mapstruct.Mapper;
9 10 import org.mapstruct.factory.Mappers;
... ... @@ -14,7 +15,7 @@ import java.util.Map;
14 15 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
15 16  
16 17 /**
17   - * 用户签到积分 Convert
  18 + * 签到记录 Convert
18 19 *
19 20 * @author 芋道源码
20 21 */
... ... @@ -33,4 +34,6 @@ public interface MemberSignInRecordConvert {
33 34 }
34 35 PageResult<MemberSignInRecordRespVO> convertPage(PageResult<MemberSignInRecordDO> pageResult);
35 36  
  37 + PageResult<AppMemberSignInRecordRespVO> convertPage02(PageResult<MemberSignInRecordDO> pageResult);
  38 +
36 39 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberLevelDO.java
  View file @9d9638b
... ... @@ -10,6 +10,8 @@ import lombok.*;
10 10 /**
11 11 * 会员等级 DO
12 12 *
  13 + * 配置每个等级需要的积分
  14 + *
13 15 * @author owen
14 16 */
15 17 @TableName("member_level")
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/level/MemberLevelLogDO.java
  View file @9d9638b
... ... @@ -9,6 +9,8 @@ import lombok.*;
9 9 /**
10 10 * 会员等级记录 DO
11 11 *
  12 + * 用户每次等级发生变更时，记录一条日志
  13 + *
12 14 * @author owen
13 15 */
14 16 @TableName("member_level_log")
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/point/MemberPointRecordDO.java
  View file @9d9638b
1 1 package cn.iocoder.yudao.module.member.dal.dataobject.point;
2 2  
3 3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  4 +import cn.iocoder.yudao.module.member.enums.point.MemberPointBizTypeEnum;
4 5 import com.baomidou.mybatisplus.annotation.KeySequence;
5 6 import com.baomidou.mybatisplus.annotation.TableId;
6 7 import com.baomidou.mybatisplus.annotation.TableName;
7 8 import lombok.*;
8 9  
9   -import java.time.LocalDateTime;
10   -
11 10 /**
12 11 * 用户积分记录 DO
13 12 *
... ... @@ -42,10 +41,10 @@ public class MemberPointRecordDO extends BaseDO {
42 41 /**
43 42 * 业务类型
44 43 *
45   - * 枚举 {@link TODO biz_type 对应枚举，然后改成 int 类型哈}
46   - * TODO @qingxia：这个改成 Integer，然后搞个枚举
  44 + * 枚举 {@link MemberPointBizTypeEnum}
47 45 */
48   - private String bizType;
  46 + private Integer bizType;
  47 +
49 48 /**
50 49 * 积分标题
51 50 */
... ... @@ -54,29 +53,17 @@ public class MemberPointRecordDO extends BaseDO {
54 53 * 积分描述
55 54 */
56 55 private String description;
  56 +
57 57 /**
58   - * 积分 正数表示获得积分 负数表示消耗积分
  58 + * 变动积分
  59 + *
  60 + * 1、正数表示获得积分
  61 + * 2、负数表示消耗积分
59 62 */
60 63 private Integer point;
61 64 /**
62 65 * 变动后的积分
63 66 */
64 67 private Integer totalPoint;
65   - /**
66   - * 状态：1-订单创建，2-冻结期，3-完成，4-失效（订单退款）
67   - *
68   - * 枚举 {@link point_status 对应的类}
69   - * TODO @qingxia：搞个枚举
70   - */
71   - private Integer status;
72   -
73   - /**
74   - * 冻结时间
75   - */
76   - private LocalDateTime freezingTime;
77   - /**
78   - * 解冻时间
79   - */
80   - private LocalDateTime thawingTime;
81 68  
82 69 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/signin/MemberSignInConfigDO.java
  View file @9d9638b
1 1 package cn.iocoder.yudao.module.member.dal.dataobject.signin;
2 2  
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
3 4 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
4 5 import com.baomidou.mybatisplus.annotation.KeySequence;
5 6 import com.baomidou.mybatisplus.annotation.TableId;
... ... @@ -7,7 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
7 8 import lombok.*;
8 9  
9 10 /**
10   - * 积分签到规则 DO
  11 + * 签到规则 DO
11 12 *
12 13 * @author QingX
13 14 */
... ... @@ -27,7 +28,7 @@ public class MemberSignInConfigDO extends BaseDO {
27 28 @TableId
28 29 private Long id;
29 30 /**
30   - * 签到第x天
  31 + * 签到第 x 天
31 32 */
32 33 private Integer day;
33 34 /**
... ... @@ -36,8 +37,10 @@ public class MemberSignInConfigDO extends BaseDO {
36 37 private Integer point;
37 38  
38 39 /**
39   - * 是否启用
  40 + * 状态
  41 + *
  42 + * 枚举 {@link CommonStatusEnum}
40 43 */
41   - private Boolean enable;
  44 + private Integer status;
42 45  
43 46 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/signin/MemberSignInRecordDO.java
  View file @9d9638b
... ... @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
7 7 import lombok.*;
8 8  
9 9 /**
10   - * 用户签到积分 DO
  10 + * 签到记录 DO
11 11 *
12 12 * @author 芋道源码
13 13 */
... ... @@ -22,7 +22,7 @@ import lombok.*;
22 22 public class MemberSignInRecordDO extends BaseDO {
23 23  
24 24 /**
25   - * 签到自增id
  25 + * 编号
26 26 */
27 27 @TableId
28 28 private Long id;
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberUserDO.java
  View file @9d9638b
... ... @@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
4 4 import cn.iocoder.yudao.framework.ip.core.Area;
5 5 import cn.iocoder.yudao.framework.mybatis.core.type.LongListTypeHandler;
6 6 import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
  7 +import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
7 8 import cn.iocoder.yudao.module.system.enums.common.SexEnum;
8 9 import com.baomidou.mybatisplus.annotation.KeySequence;
9 10 import com.baomidou.mybatisplus.annotation.TableField;
... ... @@ -109,6 +110,7 @@ public class MemberUserDO extends TenantBaseDO {
109 110 * 积分
110 111 */
111 112 private Integer point;
  113 + // TODO 芋艿：增加一个 totalPoint；个人信息接口要返回
112 114  
113 115 /**
114 116 * 会员标签列表，以逗号分隔
... ... @@ -118,6 +120,8 @@ public class MemberUserDO extends TenantBaseDO {
118 120  
119 121 /**
120 122 * 会员级别编号
  123 + *
  124 + * 关联 {@link MemberLevelDO#getLevel()} 字段
121 125 */
122 126 private Long levelId;
123 127 /**
... ... @@ -129,5 +133,4 @@ public class MemberUserDO extends TenantBaseDO {
129 133 */
130 134 private Long groupId;
131 135  
132   - // TODO 积分等等
133 136 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/level/MemberLevelMapper.java
  View file @9d9638b
... ... @@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.member.dal.mysql.level;
3 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
5 5 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
6   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.MemberLevelPageReqVO;
  6 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelPageReqVO;
7 7 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
8 8 import org.apache.ibatis.annotations.Mapper;
9 9  
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/point/MemberPointRecordMapper.java
  View file @9d9638b
1 1 package cn.iocoder.yudao.module.member.dal.mysql.point;
2 2  
  3 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
3 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 5 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
5 6 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
... ... @@ -22,7 +23,12 @@ public interface MemberPointRecordMapper extends BaseMapperX&lt;MemberPointRecordDO
22 23 .inIfPresent(MemberPointRecordDO::getUserId, userIds)
23 24 .eqIfPresent(MemberPointRecordDO::getBizType, reqVO.getBizType())
24 25 .likeIfPresent(MemberPointRecordDO::getTitle, reqVO.getTitle())
25   - .eqIfPresent(MemberPointRecordDO::getStatus, reqVO.getStatus())
  26 + .orderByDesc(MemberPointRecordDO::getId));
  27 + }
  28 +
  29 + default PageResult<MemberPointRecordDO> selectPage(Long userId, PageParam pageVO) {
  30 + return selectPage(pageVO, new LambdaQueryWrapperX<MemberPointRecordDO>()
  31 + .eq(MemberPointRecordDO::getUserId, userId)
26 32 .orderByDesc(MemberPointRecordDO::getId));
27 33 }
28 34  
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/signin/MemberSignInConfigMapper.java
  View file @9d9638b
... ... @@ -4,8 +4,10 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
4 4 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInConfigDO;
5 5 import org.apache.ibatis.annotations.Mapper;
6 6  
  7 +import java.util.List;
  8 +
7 9 /**
8   - * 积分签到规则 Mapper
  10 + * 签到规则 Mapper
9 11 *
10 12 * @author QingX
11 13 */
... ... @@ -16,4 +18,7 @@ public interface MemberSignInConfigMapper extends BaseMapperX&lt;MemberSignInConfig
16 18 return selectOne(MemberSignInConfigDO::getDay, day);
17 19 }
18 20  
  21 + default List<MemberSignInConfigDO> selectListByStatus(Integer status) {
  22 + return selectList(MemberSignInConfigDO::getStatus, status);
  23 + }
19 24 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/signin/MemberSignInRecordMapper.java
  View file @9d9638b
1 1 package cn.iocoder.yudao.module.member.dal.mysql.signin;
2 2  
  3 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
3 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 5 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
5 6 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
... ... @@ -10,7 +11,7 @@ import org.apache.ibatis.annotations.Mapper;
10 11 import java.util.Set;
11 12  
12 13 /**
13   - * 用户签到积分 Mapper
  14 + * 签到记录 Mapper
14 15 *
15 16 * @author 芋道源码
16 17 */
... ... @@ -25,4 +26,10 @@ public interface MemberSignInRecordMapper extends BaseMapperX&lt;MemberSignInRecord
25 26 .orderByDesc(MemberSignInRecordDO::getId));
26 27 }
27 28  
  29 + default PageResult<MemberSignInRecordDO> selectPage(Long userId, PageParam pageParam) {
  30 + return selectPage(pageParam, new LambdaQueryWrapperX<MemberSignInRecordDO>()
  31 + .eq(MemberSignInRecordDO::getUserId, userId)
  32 + .orderByDesc(MemberSignInRecordDO::getId));
  33 + }
  34 +
28 35 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/MemberUserMapper.java
  View file @9d9638b
... ... @@ -50,6 +50,7 @@ public interface MemberUserMapper extends BaseMapperX&lt;MemberUserDO&gt; {
50 50 .orderByDesc(MemberUserDO::getId));
51 51 }
52 52  
  53 + // TODO @疯狂：命名可以改成 updateUserLevelToNull；db 侧的操作，尽量无业务含义，更多是 select、update、insert 操作
53 54 /**
54 55 * 取消会员的等级
55 56 *
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelService.java
  View file @9d9638b
... ... @@ -2,9 +2,9 @@ package cn.iocoder.yudao.module.member.service.level;
2 2  
3 3 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.MemberLevelCreateReqVO;
6   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.MemberLevelPageReqVO;
7   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.MemberLevelUpdateReqVO;
  5 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelCreateReqVO;
  6 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelPageReqVO;
  7 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelUpdateReqVO;
8 8 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
9 9 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
10 10 import cn.iocoder.yudao.module.member.enums.MemberExperienceBizTypeEnum;
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImpl.java
  View file @9d9638b
... ... @@ -6,9 +6,9 @@ import cn.hutool.core.util.ObjUtil;
6 6 import cn.hutool.core.util.ObjectUtil;
7 7 import cn.hutool.core.util.StrUtil;
8 8 import cn.iocoder.yudao.framework.common.pojo.PageResult;
9   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.MemberLevelCreateReqVO;
10   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.MemberLevelPageReqVO;
11   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.MemberLevelUpdateReqVO;
  9 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelCreateReqVO;
  10 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelPageReqVO;
  11 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelUpdateReqVO;
12 12 import cn.iocoder.yudao.module.member.convert.level.MemberLevelConvert;
13 13 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
14 14 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
... ... @@ -74,6 +74,7 @@ public class MemberLevelServiceImpl implements MemberLevelService {
74 74  
75 75 @Override
76 76 public void deleteLevel(Long id) {
  77 + // TODO @疯狂：校验是否有用户使用该等级
77 78 // 校验存在
78 79 validateLevelExists(id);
79 80 // 删除
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointConfigService.java
  View file @9d9638b
... ... @@ -17,13 +17,13 @@ public interface MemberPointConfigService {
17 17 *
18 18 * @param saveReqVO 更新信息
19 19 */
20   - void saveConfig(@Valid MemberPointConfigSaveReqVO saveReqVO);
  20 + void savePointConfig(@Valid MemberPointConfigSaveReqVO saveReqVO);
21 21  
22 22 /**
23 23 * 获得会员积分配置
24 24 *
25 25 * @return 积分配置
26 26 */
27   - MemberPointConfigDO getConfig();
  27 + MemberPointConfigDO getPointConfig();
28 28  
29 29 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointConfigServiceImpl.java
  View file @9d9638b
... ... @@ -24,9 +24,9 @@ public class MemberPointConfigServiceImpl implements MemberPointConfigService {
24 24 private MemberPointConfigMapper pointConfigMapper;
25 25  
26 26 @Override
27   - public void saveConfig(MemberPointConfigSaveReqVO saveReqVO) {
  27 + public void savePointConfig(MemberPointConfigSaveReqVO saveReqVO) {
28 28 // 存在，则进行更新
29   - MemberPointConfigDO dbConfig = getConfig();
  29 + MemberPointConfigDO dbConfig = getPointConfig();
30 30 if (dbConfig != null) {
31 31 pointConfigMapper.updateById(MemberPointConfigConvert.INSTANCE.convert(saveReqVO).setId(dbConfig.getId()));
32 32 return;
... ... @@ -36,7 +36,7 @@ public class MemberPointConfigServiceImpl implements MemberPointConfigService {
36 36 }
37 37  
38 38 @Override
39   - public MemberPointConfigDO getConfig() {
  39 + public MemberPointConfigDO getPointConfig() {
40 40 List<MemberPointConfigDO> list = pointConfigMapper.selectList();
41 41 return CollectionUtils.getFirst(list);
42 42 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordService.java
  View file @9d9638b
1 1 package cn.iocoder.yudao.module.member.service.point;
2 2  
  3 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
3 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 5 import cn.iocoder.yudao.module.member.controller.admin.point.vo.recrod.MemberPointRecordPageReqVO;
5 6 import cn.iocoder.yudao.module.member.dal.dataobject.point.MemberPointRecordDO;
6 7  
7   -import javax.validation.Valid;
8   -
9 8 /**
10 9 * 用户积分记录 Service 接口
11 10 *
... ... @@ -14,11 +13,20 @@ import javax.validation.Valid;
14 13 public interface MemberPointRecordService {
15 14  
16 15 /**
17   - * 获得用户积分记录分页
  16 + * 【管理员】获得积分记录分页
18 17 *
19 18 * @param pageReqVO 分页查询
20   - * @return 用户积分记录分页
  19 + * @return 签到记录分页
  20 + */
  21 + PageResult<MemberPointRecordDO> getPointRecordPage(MemberPointRecordPageReqVO pageReqVO);
  22 +
  23 + /**
  24 + * 【会员】获得积分记录分页
  25 + *
  26 + * @param userId 用户编号
  27 + * @param pageVO 分页查询
  28 + * @return 签到记录分页
21 29 */
22   - PageResult<MemberPointRecordDO> getRecordPage(MemberPointRecordPageReqVO pageReqVO);
  30 + PageResult<MemberPointRecordDO> getPointRecordPage(Long userId, PageParam pageVO);
23 31  
24 32 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordServiceImpl.java
  View file @9d9638b
1 1 package cn.iocoder.yudao.module.member.service.point;
2 2  
  3 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
3 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 5 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
5 6 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
... ... @@ -19,7 +20,7 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.
19 20  
20 21  
21 22 /**
22   - * 用户积分记录 Service 实现类
  23 + * 积分记录 Service 实现类
23 24 *
24 25 * @author QingX
25 26 */
... ... @@ -34,7 +35,7 @@ public class MemberPointRecordServiceImpl implements MemberPointRecordService {
34 35 private MemberUserApi memberUserApi;
35 36  
36 37 @Override
37   - public PageResult<MemberPointRecordDO> getRecordPage(MemberPointRecordPageReqVO pageReqVO) {
  38 + public PageResult<MemberPointRecordDO> getPointRecordPage(MemberPointRecordPageReqVO pageReqVO) {
38 39 // 根据用户昵称查询出用户 ids
39 40 Set<Long> userIds = null;
40 41 if (StringUtils.isNotBlank(pageReqVO.getNickname())) {
... ... @@ -49,4 +50,9 @@ public class MemberPointRecordServiceImpl implements MemberPointRecordService {
49 50 return recordMapper.selectPage(pageReqVO, userIds);
50 51 }
51 52  
  53 + @Override
  54 + public PageResult<MemberPointRecordDO> getPointRecordPage(Long userId, PageParam pageVO) {
  55 + return recordMapper.selectPage(userId, pageVO);
  56 + }
  57 +
52 58 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInConfigService.java
  View file @9d9638b
... ... @@ -8,14 +8,14 @@ import javax.validation.Valid;
8 8 import java.util.List;
9 9  
10 10 /**
11   - * 积分签到规则 Service 接口
  11 + * 签到规则 Service 接口
12 12 *
13 13 * @author QingX
14 14 */
15 15 public interface MemberSignInConfigService {
16 16  
17 17 /**
18   - * 创建积分签到规则
  18 + * 创建签到规则
19 19 *
20 20 * @param createReqVO 创建信息
21 21 * @return 编号
... ... @@ -23,32 +23,40 @@ public interface MemberSignInConfigService {
23 23 Long createSignInConfig(@Valid MemberSignInConfigCreateReqVO createReqVO);
24 24  
25 25 /**
26   - * 更新积分签到规则
  26 + * 更新签到规则
27 27 *
28 28 * @param updateReqVO 更新信息
29 29 */
30 30 void updateSignInConfig(@Valid MemberSignInConfigUpdateReqVO updateReqVO);
31 31  
32 32 /**
33   - * 删除积分签到规则
  33 + * 删除签到规则
34 34 *
35 35 * @param id 编号
36 36 */
37 37 void deleteSignInConfig(Long id);
38 38  
39 39 /**
40   - * 获得积分签到规则
  40 + * 获得签到规则
41 41 *
42 42 * @param id 编号
43   - * @return 积分签到规则
  43 + * @return 签到规则
44 44 */
45 45 MemberSignInConfigDO getSignInConfig(Long id);
46 46  
47 47 /**
48   - * 获得积分签到规则分页
  48 + * 获得签到规则列表
49 49 *
50   - * @return 积分签到规则分页
  50 + * @return 签到规则分页
51 51 */
52 52 List<MemberSignInConfigDO> getSignInConfigList();
53 53  
  54 + /**
  55 + * 获得签到规则列表
  56 + *
  57 + * @param status 状态
  58 + * @return 签到规则分页
  59 + */
  60 + List<MemberSignInConfigDO> getSignInConfigList(Integer status);
  61 +
54 62 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInConfigServiceImpl.java
  View file @9d9638b
... ... @@ -17,7 +17,7 @@ import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.SIGN_IN_CO
17 17 import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.SIGN_IN_CONFIG_NOT_EXISTS;
18 18  
19 19 /**
20   - * 积分签到规则 Service 实现类
  20 + * 签到规则 Service 实现类
21 21 *
22 22 * @author QingX
23 23 */
... ... @@ -73,13 +73,13 @@ public class MemberSignInConfigServiceImpl implements MemberSignInConfigService
73 73 * @param id 编号，只有更新的时候会传递
74 74 */
75 75 private void validateSignInConfigDayDuplicate(Integer day, Long id) {
76   - MemberSignInConfigDO configDO = signInConfigMapper.selectByDay(day);
77   - // 1. 新增时，configDO 非空，则说明重复
78   - if (id == null && configDO != null) {
  76 + MemberSignInConfigDO config = signInConfigMapper.selectByDay(day);
  77 + // 1. 新增时，config 非空，则说明重复
  78 + if (id == null && config != null) {
79 79 throw exception(SIGN_IN_CONFIG_EXISTS);
80 80 }
81   - // 2. 更新时，如果 configDO 非空，且 id 不相等，则说明重复
82   - if (id != null && configDO != null && !configDO.getId().equals(id)) {
  81 + // 2. 更新时，如果 config 非空，且 id 不相等，则说明重复
  82 + if (id != null && config != null && !config.getId().equals(id)) {
83 83 throw exception(SIGN_IN_CONFIG_EXISTS);
84 84 }
85 85 }
... ... @@ -96,4 +96,11 @@ public class MemberSignInConfigServiceImpl implements MemberSignInConfigService
96 96 return list;
97 97 }
98 98  
  99 + @Override
  100 + public List<MemberSignInConfigDO> getSignInConfigList(Integer status) {
  101 + List<MemberSignInConfigDO> list = signInConfigMapper.selectListByStatus(status);
  102 + list.sort(Comparator.comparing(MemberSignInConfigDO::getDay));
  103 + return list;
  104 + }
  105 +
99 106 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordService.java
  View file @9d9638b
1 1 package cn.iocoder.yudao.module.member.service.signin;
2 2  
  3 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
3 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 5 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordPageReqVO;
5 6 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
6 7  
7 8 /**
8   - * 用户签到积分 Service 接口
  9 + * 签到记录 Service 接口
9 10 *
10 11 * @author 芋道源码
11 12 */
12 13 public interface MemberSignInRecordService {
13 14  
14 15 /**
15   - * 获得用户签到积分分页
  16 + * 【管理员】获得签到记录分页
16 17 *
17 18 * @param pageReqVO 分页查询
18   - * @return 用户签到积分分页
  19 + * @return 签到记录分页
19 20 */
20 21 PageResult<MemberSignInRecordDO> getSignInRecordPage(MemberSignInRecordPageReqVO pageReqVO);
21 22  
  23 + /**
  24 + * 【会员】获得签到记录分页
  25 + *
  26 + * @param userId 用户编号
  27 + * @param pageParam 分页查询
  28 + * @return 签到记录分页
  29 + */
  30 + PageResult<MemberSignInRecordDO> getSignRecordPage(Long userId, PageParam pageParam);
  31 +
22 32 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/signin/MemberSignInRecordServiceImpl.java
  View file @9d9638b
1 1 package cn.iocoder.yudao.module.member.service.signin;
2 2  
  3 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
3 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 5 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
5 6 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
6 7 import cn.iocoder.yudao.module.member.controller.admin.signin.vo.record.MemberSignInRecordPageReqVO;
  8 +import cn.iocoder.yudao.module.member.controller.app.signin.vo.record.AppMemberSignInRecordRespVO;
7 9 import cn.iocoder.yudao.module.member.dal.dataobject.signin.MemberSignInRecordDO;
8 10 import cn.iocoder.yudao.module.member.dal.mysql.signin.MemberSignInRecordMapper;
9 11 import org.apache.commons.lang3.StringUtils;
... ... @@ -18,7 +20,7 @@ import java.util.Set;
18 20 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
19 21  
20 22 /**
21   - * 用户签到积分 Service 实现类
  23 + * 签到记录 Service 实现类
22 24 *
23 25 * @author 芋道源码
24 26 */
... ... @@ -34,7 +36,7 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService
34 36  
35 37 @Override
36 38 public PageResult<MemberSignInRecordDO> getSignInRecordPage(MemberSignInRecordPageReqVO pageReqVO) {
37   - // 根据用户昵称查询出用户ids
  39 + // 根据用户昵称查询出用户 ids
38 40 Set<Long> userIds = null;
39 41 if (StringUtils.isNotBlank(pageReqVO.getNickname())) {
40 42 List<MemberUserRespDTO> users = memberUserApi.getUserListByNickname(pageReqVO.getNickname());
... ... @@ -44,7 +46,13 @@ public class MemberSignInRecordServiceImpl implements MemberSignInRecordService
44 46 }
45 47 userIds = convertSet(users, MemberUserRespDTO::getId);
46 48 }
  49 + // 分页查询
47 50 return signInRecordMapper.selectPage(pageReqVO, userIds);
48 51 }
49 52  
  53 + @Override
  54 + public PageResult<MemberSignInRecordDO> getSignRecordPage(Long userId, PageParam pageParam) {
  55 + return signInRecordMapper.selectPage(userId, pageParam);
  56 + }
  57 +
50 58 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/tag/MemberTagService.java
  View file @9d9638b
... ... @@ -68,5 +68,6 @@ public interface MemberTagService {
68 68 *
69 69 * @return 标签列表
70 70 */
71   - List<MemberTagDO> getList();
  71 + List<MemberTagDO> getTagList();
  72 +
72 73 }
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/tag/MemberTagServiceImpl.java
  View file @9d9638b
... ... @@ -106,7 +106,7 @@ public class MemberTagServiceImpl implements MemberTagService {
106 106 }
107 107  
108 108 @Override
109   - public List<MemberTagDO> getList() {
  109 + public List<MemberTagDO> getTagList() {
110 110 return tagMapper.selectList();
111 111 }
112 112  
... ...
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
  View file @9d9638b
... ... @@ -184,8 +184,8 @@ public class MemberUserServiceImpl implements MemberUserService {
184 184 return passwordEncoder.encode(password);
185 185 }
186 186  
187   - @Transactional(rollbackFor = Exception.class)
188 187 @Override
  188 + @Transactional(rollbackFor = Exception.class)
189 189 public void updateUser(MemberUserUpdateReqVO updateReqVO) {
190 190 // 校验存在
191 191 MemberUserDO user = validateUserExists(updateReqVO.getId());
... ... @@ -197,6 +197,7 @@ public class MemberUserServiceImpl implements MemberUserService {
197 197 memberUserMapper.updateById(updateObj);
198 198  
199 199 // 会员级别修改
  200 + // TODO @疯狂：修改用户等级，要不要单独一个前端操作 + 接口；因为它是个相对严肃独立的动作
200 201 memberLevelService.updateUserLevel(user, updateReqVO.getLevelId(), updateReqVO.getLevelReason());
201 202 }
202 203  
... ...
yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/auth/MemberAuthServiceTest.java
  View file @9d9638b
... ... @@ -5,16 +5,13 @@ import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
5 5 import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
6 6 import cn.iocoder.yudao.framework.redis.config.YudaoRedisAutoConfiguration;
7 7 import cn.iocoder.yudao.framework.test.core.ut.BaseDbAndRedisUnitTest;
8   -import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserResetPasswordReqVO;
9   -import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserUpdatePasswordReqVO;
10 8 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
11 9 import cn.iocoder.yudao.module.member.dal.mysql.user.MemberUserMapper;
12 10 import cn.iocoder.yudao.module.member.service.user.MemberUserService;
13   -import cn.iocoder.yudao.module.system.api.oauth2.OAuth2TokenApi;
14 11 import cn.iocoder.yudao.module.system.api.logger.LoginLogApi;
  12 +import cn.iocoder.yudao.module.system.api.oauth2.OAuth2TokenApi;
15 13 import cn.iocoder.yudao.module.system.api.sms.SmsCodeApi;
16 14 import cn.iocoder.yudao.module.system.api.social.SocialUserApi;
17   -import org.junit.jupiter.api.Test;
18 15 import org.springframework.boot.test.mock.mockito.MockBean;
19 16 import org.springframework.context.annotation.Import;
20 17 import org.springframework.security.crypto.password.PasswordEncoder;
... ... @@ -23,11 +20,8 @@ import javax.annotation.Resource;
23 20 import java.util.function.Consumer;
24 21  
25 22 import static cn.hutool.core.util.RandomUtil.randomEle;
26   -import static cn.hutool.core.util.RandomUtil.randomNumbers;
27 23 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
28 24 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomString;
29   -import static org.junit.jupiter.api.Assertions.assertEquals;
30   -import static org.mockito.Mockito.when;
31 25  
32 26 // TODO @芋艿：单测的 review，等逻辑都达成一致后
33 27 /**
... ... @@ -61,55 +55,56 @@ public class MemberAuthServiceTest extends BaseDbAndRedisUnitTest {
61 55 @Resource
62 56 private MemberUserMapper memberUserMapper;
63 57  
64   - @Test
65   - public void testUpdatePassword_success(){
66   - // 准备参数
67   - MemberUserDO userDO = randomUserDO();
68   - memberUserMapper.insert(userDO);
69   -
70   - // 新密码
71   - String newPassword = randomString();
72   -
73   - // 请求实体
74   - AppMemberUserUpdatePasswordReqVO reqVO = AppMemberUserUpdatePasswordReqVO.builder()
75   - .oldPassword(userDO.getPassword())
76   - .password(newPassword)
77   - .build();
78   -
79   - // 测试桩
80   - // 这两个相等是为了返回ture这个结果
81   - when(passwordEncoder.matches(reqVO.getOldPassword(),reqVO.getOldPassword())).thenReturn(true);
82   - when(passwordEncoder.encode(newPassword)).thenReturn(newPassword);
83   -
84   - // 更新用户密码
85   - authService.updatePassword(userDO.getId(), reqVO);
86   - assertEquals(memberUserMapper.selectById(userDO.getId()).getPassword(),newPassword);
87   - }
88   -
89   - @Test
90   - public void testResetPassword_success(){
91   - // 准备参数
92   - MemberUserDO userDO = randomUserDO();
93   - memberUserMapper.insert(userDO);
94   -
95   - // 随机密码
96   - String password = randomNumbers(11);
97   - // 随机验证码
98   - String code = randomNumbers(4);
99   -
100   - // mock
101   - when(passwordEncoder.encode(password)).thenReturn(password);
102   -
103   - // 更新用户密码
104   - AppMemberUserResetPasswordReqVO reqVO = new AppMemberUserResetPasswordReqVO();
105   - reqVO.setMobile(userDO.getMobile());
106   - reqVO.setPassword(password);
107   - reqVO.setCode(code);
108   -
109   - authService.resetPassword(reqVO);
110   - assertEquals(memberUserMapper.selectById(userDO.getId()).getPassword(),password);
111   - }
112   -
  58 + // TODO 芋艿：后续重构这个单测
  59 +// @Test
  60 +// public void testUpdatePassword_success(){
  61 +// // 准备参数
  62 +// MemberUserDO userDO = randomUserDO();
  63 +// memberUserMapper.insert(userDO);
  64 +//
  65 +// // 新密码
  66 +// String newPassword = randomString();
  67 +//
  68 +// // 请求实体
  69 +// AppMemberUserUpdatePasswordReqVO reqVO = AppMemberUserUpdatePasswordReqVO.builder()
  70 +// .oldPassword(userDO.getPassword())
  71 +// .password(newPassword)
  72 +// .build();
  73 +//
  74 +// // 测试桩
  75 +// // 这两个相等是为了返回ture这个结果
  76 +// when(passwordEncoder.matches(reqVO.getOldPassword(),reqVO.getOldPassword())).thenReturn(true);
  77 +// when(passwordEncoder.encode(newPassword)).thenReturn(newPassword);
  78 +//
  79 +// // 更新用户密码
  80 +// authService.updatePassword(userDO.getId(), reqVO);
  81 +// assertEquals(memberUserMapper.selectById(userDO.getId()).getPassword(),newPassword);
  82 +// }
  83 +
  84 + // TODO 芋艿：后续重构这个单测
  85 +// @Test
  86 +// public void testResetPassword_success(){
  87 +// // 准备参数
  88 +// MemberUserDO userDO = randomUserDO();
  89 +// memberUserMapper.insert(userDO);
  90 +//
  91 +// // 随机密码
  92 +// String password = randomNumbers(11);
  93 +// // 随机验证码
  94 +// String code = randomNumbers(4);
  95 +//
  96 +// // mock
  97 +// when(passwordEncoder.encode(password)).thenReturn(password);
  98 +//
  99 +// // 更新用户密码
  100 +// AppMemberUserResetPasswordReqVO reqVO = new AppMemberUserResetPasswordReqVO();
  101 +// reqVO.setMobile(userDO.getMobile());
  102 +// reqVO.setPassword(password);
  103 +// reqVO.setCode(code);
  104 +//
  105 +// authService.resetPassword(reqVO);
  106 +// assertEquals(memberUserMapper.selectById(userDO.getId()).getPassword(),password);
  107 +// }
113 108  
114 109 // ========== 随机对象 ==========
115 110  
... ...
yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/level/MemberLevelServiceImplTest.java
  View file @9d9638b
... ... @@ -4,9 +4,9 @@ import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 5 import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
6 6 import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
7   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.MemberLevelCreateReqVO;
8   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.MemberLevelPageReqVO;
9   -import cn.iocoder.yudao.module.member.controller.admin.level.vo.MemberLevelUpdateReqVO;
  7 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelCreateReqVO;
  8 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelPageReqVO;
  9 +import cn.iocoder.yudao.module.member.controller.admin.level.vo.level.MemberLevelUpdateReqVO;
10 10 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
11 11 import cn.iocoder.yudao.module.member.dal.mysql.level.MemberLevelMapper;
12 12 import org.junit.jupiter.api.Test;
... ... @@ -25,6 +25,7 @@ import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
25 25 import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.*;
26 26 import static org.junit.jupiter.api.Assertions.*;
27 27  
  28 +// TODO 芋艿：完全 review 完，在去 review 单测
28 29 /**
29 30 * {@link MemberLevelServiceImpl} 的单元测试类
30 31 *
... ...
yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImplTest.java
  View file @9d9638b
... ... @@ -18,15 +18,12 @@ import org.springframework.data.redis.core.StringRedisTemplate;
18 18 import org.springframework.security.crypto.password.PasswordEncoder;
19 19  
20 20 import javax.annotation.Resource;
21   -import java.io.ByteArrayInputStream;
22 21 import java.util.function.Consumer;
23 22  
24   -import static cn.hutool.core.util.RandomUtil.*;
  23 +import static cn.hutool.core.util.RandomUtil.randomEle;
  24 +import static cn.hutool.core.util.RandomUtil.randomNumbers;
25 25 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
26   -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomString;
27 26 import static org.junit.jupiter.api.Assertions.assertEquals;
28   -import static org.mockito.Mockito.eq;
29   -import static org.mockito.Mockito.when;
30 27  
31 28 // TODO @芋艿：单测的 review，等逻辑都达成一致后
32 29 /**
... ... @@ -57,41 +54,42 @@ public class MemberUserServiceImplTest extends BaseDbAndRedisUnitTest {
57 54 @MockBean
58 55 private FileApi fileApi;
59 56  
60   - @Test
61   - public void testUpdateNickName_success(){
62   - // mock 数据
63   - MemberUserDO userDO = randomUserDO();
64   - userMapper.insert(userDO);
65   -
66   - // 随机昵称
67   - String newNickName = randomString();
68   -
69   - // 调用接口修改昵称
70   - memberUserService.updateUser(userDO.getId(),newNickName);
71   - // 查询新修改后的昵称
72   - String nickname = memberUserService.getUser(userDO.getId()).getNickname();
73   - // 断言
74   - assertEquals(newNickName,nickname);
75   - }
76   -
77   - @Test
78   - public void testUpdateAvatar_success() throws Exception {
79   - // mock 数据
80   - MemberUserDO dbUser = randomUserDO();
81   - userMapper.insert(dbUser);
82   -
83   - // 准备参数
84   - Long userId = dbUser.getId();
85   - byte[] avatarFileBytes = randomBytes(10);
86   - ByteArrayInputStream avatarFile = new ByteArrayInputStream(avatarFileBytes);
87   - // mock 方法
88   - String avatar = randomString();
89   - when(fileApi.createFile(eq(avatarFileBytes))).thenReturn(avatar);
90   - // 调用
91   - String str = memberUserService.updateUserAvatar(userId, avatarFile);
92   - // 断言
93   - assertEquals(avatar, str);
94   - }
  57 + // TODO 芋艿：后续重构这个单测
  58 +// @Test
  59 +// public void testUpdateNickName_success(){
  60 +// // mock 数据
  61 +// MemberUserDO userDO = randomUserDO();
  62 +// userMapper.insert(userDO);
  63 +//
  64 +// // 随机昵称
  65 +// String newNickName = randomString();
  66 +//
  67 +// // 调用接口修改昵称
  68 +// memberUserService.updateUser(userDO.getId(),newNickName);
  69 +// // 查询新修改后的昵称
  70 +// String nickname = memberUserService.getUser(userDO.getId()).getNickname();
  71 +// // 断言
  72 +// assertEquals(newNickName,nickname);
  73 +// }
  74 +//
  75 +// @Test
  76 +// public void testUpdateAvatar_success() throws Exception {
  77 +// // mock 数据
  78 +// MemberUserDO dbUser = randomUserDO();
  79 +// userMapper.insert(dbUser);
  80 +//
  81 +// // 准备参数
  82 +// Long userId = dbUser.getId();
  83 +// byte[] avatarFileBytes = randomBytes(10);
  84 +// ByteArrayInputStream avatarFile = new ByteArrayInputStream(avatarFileBytes);
  85 +// // mock 方法
  86 +// String avatar = randomString();
  87 +// when(fileApi.createFile(eq(avatarFileBytes))).thenReturn(avatar);
  88 +// // 调用
  89 +// String str = memberUserService.updateUserAvatar(userId, avatarFile);
  90 +// // 断言
  91 +// assertEquals(avatar, str);
  92 +// }
95 93  
96 94 @Test
97 95 public void updateMobile_success(){
... ... @@ -117,7 +115,6 @@ public class MemberUserServiceImplTest extends BaseDbAndRedisUnitTest {
117 115 AppMemberUserUpdateMobileReqVO reqVO = new AppMemberUserUpdateMobileReqVO();
118 116 reqVO.setMobile(newMobile);
119 117 reqVO.setCode(newCode);
120   - reqVO.setOldMobile(oldMobile);
121 118 reqVO.setOldCode(oldCode);
122 119 memberUserService.updateUserMobile(userDO.getId(),reqVO);
123 120  
... ...