BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 2485a5ebc9005e9c6c77a110f14139f031304226

Authored by YunaiV
1 parent 5d2d5202

mall + pay： 

1. 将 amount 统一都修改成 price
2. 将 payed 统一改成 payStatus
Inline Side-by-side
Showing 38 changed files with 225 additions and 286 deletions
sql/mysql/ruoyi-vue-pro.sql
  View file @2485a5e
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 Target Server Version : 80026 11 Target Server Version : 80026
12 File Encoding : 65001 12 File Encoding : 65001
13 13
14 - Date: 13/04/2023 23:37:01 14 + Date: 09/07/2023 20:25:37
15 */ 15 */
16 16
17 SET NAMES utf8mb4; 17 SET NAMES utf8mb4;
@@ -415,7 +415,7 @@ CREATE TABLE `bpm_task_assign_rule` ( @@ -415,7 +415,7 @@ CREATE TABLE `bpm_task_assign_rule` (
415 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', 415 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
416 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', 416 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
417 PRIMARY KEY (`id`) USING BTREE 417 PRIMARY KEY (`id`) USING BTREE
418 -) ENGINE = InnoDB AUTO_INCREMENT = 275 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'Bpm 任务规则表'; 418 +) ENGINE = InnoDB AUTO_INCREMENT = 276 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'Bpm 任务规则表';
419 419
420 -- ---------------------------- 420 -- ----------------------------
421 -- Records of bpm_task_assign_rule 421 -- Records of bpm_task_assign_rule
@@ -546,7 +546,7 @@ CREATE TABLE `infra_api_error_log` ( @@ -546,7 +546,7 @@ CREATE TABLE `infra_api_error_log` (
546 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', 546 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
547 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', 547 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
548 PRIMARY KEY (`id`) USING BTREE 548 PRIMARY KEY (`id`) USING BTREE
549 -) ENGINE = InnoDB AUTO_INCREMENT = 1110 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '系统异常日志'; 549 +) ENGINE = InnoDB AUTO_INCREMENT = 1291 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '系统异常日志';
550 550
551 -- ---------------------------- 551 -- ----------------------------
552 -- Records of infra_api_error_log 552 -- Records of infra_api_error_log
@@ -584,7 +584,7 @@ CREATE TABLE `infra_codegen_column` ( @@ -584,7 +584,7 @@ CREATE TABLE `infra_codegen_column` (
584 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', 584 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
585 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', 585 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
586 PRIMARY KEY (`id`) USING BTREE 586 PRIMARY KEY (`id`) USING BTREE
587 -) ENGINE = InnoDB AUTO_INCREMENT = 1688 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '代码生成表字段定义'; 587 +) ENGINE = InnoDB AUTO_INCREMENT = 1698 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '代码生成表字段定义';
588 588
589 -- ---------------------------- 589 -- ----------------------------
590 -- Records of infra_codegen_column 590 -- Records of infra_codegen_column
@@ -644,7 +644,7 @@ CREATE TABLE `infra_config` ( @@ -644,7 +644,7 @@ CREATE TABLE `infra_config` (
644 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', 644 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
645 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', 645 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
646 PRIMARY KEY (`id`) USING BTREE 646 PRIMARY KEY (`id`) USING BTREE
647 -) ENGINE = InnoDB AUTO_INCREMENT = 11 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '参数配置表'; 647 +) ENGINE = InnoDB AUTO_INCREMENT = 12 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '参数配置表';
648 648
649 -- ---------------------------- 649 -- ----------------------------
650 -- Records of infra_config 650 -- Records of infra_config
@@ -655,6 +655,7 @@ INSERT INTO `infra_config` (`id`, `category`, `type`, `name`, `config_key`, `val @@ -655,6 +655,7 @@ INSERT INTO `infra_config` (`id`, `category`, `type`, `name`, `config_key`, `val
655 INSERT INTO `infra_config` (`id`, `category`, `type`, `name`, `config_key`, `value`, `visible`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (8, 'url', 2, 'SkyWalking 监控的地址', 'url.skywalking', '', b'1', '', '1', '2023-04-07 13:41:16', '1', '2023-04-07 14:57:03', b'0'); 655 INSERT INTO `infra_config` (`id`, `category`, `type`, `name`, `config_key`, `value`, `visible`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (8, 'url', 2, 'SkyWalking 监控的地址', 'url.skywalking', '', b'1', '', '1', '2023-04-07 13:41:16', '1', '2023-04-07 14:57:03', b'0');
656 INSERT INTO `infra_config` (`id`, `category`, `type`, `name`, `config_key`, `value`, `visible`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (9, 'url', 2, 'Spring Boot Admin 监控的地址', 'url.spring-boot-admin', '', b'1', '', '1', '2023-04-07 13:41:16', '1', '2023-04-07 14:52:07', b'0'); 656 INSERT INTO `infra_config` (`id`, `category`, `type`, `name`, `config_key`, `value`, `visible`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (9, 'url', 2, 'Spring Boot Admin 监控的地址', 'url.spring-boot-admin', '', b'1', '', '1', '2023-04-07 13:41:16', '1', '2023-04-07 14:52:07', b'0');
657 INSERT INTO `infra_config` (`id`, `category`, `type`, `name`, `config_key`, `value`, `visible`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (10, 'url', 2, 'Swagger 接口文档的地址', 'url.swagger', '', b'1', '', '1', '2023-04-07 13:41:16', '1', '2023-04-07 14:59:00', b'0'); 657 INSERT INTO `infra_config` (`id`, `category`, `type`, `name`, `config_key`, `value`, `visible`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (10, 'url', 2, 'Swagger 接口文档的地址', 'url.swagger', '', b'1', '', '1', '2023-04-07 13:41:16', '1', '2023-04-07 14:59:00', b'0');
  658 +INSERT INTO `infra_config` (`id`, `category`, `type`, `name`, `config_key`, `value`, `visible`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (11, 'ui', 2, '腾讯地图 key', 'tencent.lbs.key', 'TVDBZ-TDILD-4ON4B-PFDZA-RNLKH-VVF6E', b'1', '腾讯地图 key', '1', '2023-06-03 19:16:27', '1', '2023-06-03 19:16:27', b'0');
658 COMMIT; 659 COMMIT;
659 660
660 -- ---------------------------- 661 -- ----------------------------
@@ -699,7 +700,7 @@ CREATE TABLE `infra_file` ( @@ -699,7 +700,7 @@ CREATE TABLE `infra_file` (
699 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', 700 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
700 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', 701 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
701 PRIMARY KEY (`id`) USING BTREE 702 PRIMARY KEY (`id`) USING BTREE
702 -) ENGINE = InnoDB AUTO_INCREMENT = 912 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '文件表'; 703 +) ENGINE = InnoDB AUTO_INCREMENT = 953 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '文件表';
703 704
704 -- ---------------------------- 705 -- ----------------------------
705 -- Records of infra_file 706 -- Records of infra_file
@@ -753,7 +754,7 @@ CREATE TABLE `infra_file_content` ( @@ -753,7 +754,7 @@ CREATE TABLE `infra_file_content` (
753 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', 754 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
754 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', 755 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
755 PRIMARY KEY (`id`) USING BTREE 756 PRIMARY KEY (`id`) USING BTREE
756 -) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '文件表'; 757 +) ENGINE = InnoDB AUTO_INCREMENT = 44 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '文件表';
757 758
758 -- ---------------------------- 759 -- ----------------------------
759 -- Records of infra_file_content 760 -- Records of infra_file_content
@@ -812,7 +813,7 @@ CREATE TABLE `infra_job_log` ( @@ -812,7 +813,7 @@ CREATE TABLE `infra_job_log` (
812 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', 813 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
813 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', 814 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
814 PRIMARY KEY (`id`) USING BTREE 815 PRIMARY KEY (`id`) USING BTREE
815 -) ENGINE = InnoDB AUTO_INCREMENT = 168767 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '定时任务日志表'; 816 +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '定时任务日志表';
816 817
817 -- ---------------------------- 818 -- ----------------------------
818 -- Records of infra_job_log 819 -- Records of infra_job_log
@@ -867,7 +868,7 @@ CREATE TABLE `member_user` ( @@ -867,7 +868,7 @@ CREATE TABLE `member_user` (
867 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', 868 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
868 PRIMARY KEY (`id`) USING BTREE, 869 PRIMARY KEY (`id`) USING BTREE,
869 UNIQUE INDEX `uk_mobile`(`mobile` ASC) USING BTREE COMMENT '手机号' 870 UNIQUE INDEX `uk_mobile`(`mobile` ASC) USING BTREE COMMENT '手机号'
870 -) ENGINE = InnoDB AUTO_INCREMENT = 247 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户'; 871 +) ENGINE = InnoDB AUTO_INCREMENT = 248 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户';
871 872
872 -- ---------------------------- 873 -- ----------------------------
873 -- Records of member_user 874 -- Records of member_user
@@ -935,7 +936,7 @@ CREATE TABLE `system_dict_data` ( @@ -935,7 +936,7 @@ CREATE TABLE `system_dict_data` (
935 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', 936 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
936 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', 937 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
937 PRIMARY KEY (`id`) USING BTREE 938 PRIMARY KEY (`id`) USING BTREE
938 -) ENGINE = InnoDB AUTO_INCREMENT = 1234 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典数据表'; 939 +) ENGINE = InnoDB AUTO_INCREMENT = 1341 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典数据表';
939 940
940 -- ---------------------------- 941 -- ----------------------------
941 -- Records of system_dict_data 942 -- Records of system_dict_data
@@ -1147,6 +1148,24 @@ INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `st @@ -1147,6 +1148,24 @@ INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `st
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 (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'); 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 (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');
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 (1233, 21, 'Vue3 Element Plus Schema 模版', '21', 'infra_codegen_front_type', 0, '', '', '', '1', '2023-04-13 00:04:26', '1', '2023-04-13 00:04:26', b'0'); 1149 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 (1233, 21, 'Vue3 Element Plus Schema 模版', '21', 'infra_codegen_front_type', 0, '', '', '', '1', '2023-04-13 00:04:26', '1', '2023-04-13 00:04:26', b'0');
1149 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 (1234, 30, 'Vue3 vben 模版', '30', 'infra_codegen_front_type', 0, '', '', '', '1', '2023-04-13 00:04:26', '1', '2023-04-13 00:04:26', b'0'); 1150 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 (1234, 30, 'Vue3 vben 模版', '30', 'infra_codegen_front_type', 0, '', '', '', '1', '2023-04-13 00:04:26', '1', '2023-04-13 00:04:26', b'0');
  1151 +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 (1235, 1, '个', '1', 'product_unit', 0, '', '', '', '1', '2023-05-23 14:38:38', '1', '2023-05-23 14:38:38', b'0');
  1152 +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 (1236, 1, '件', '2', 'product_unit', 0, '', '', '', '1', '2023-05-23 14:38:38', '1', '2023-05-23 14:38:38', b'0');
  1153 +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 (1237, 1, '盒', '3', 'product_unit', 0, '', '', '', '1', '2023-05-23 14:38:38', '1', '2023-05-23 14:38:38', b'0');
  1154 +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 (1238, 1, '袋', '4', 'product_unit', 0, '', '', '', '1', '2023-05-23 14:38:38', '1', '2023-05-23 14:38:38', b'0');
  1155 +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 (1239, 1, '箱', '5', 'product_unit', 0, '', '', '', '1', '2023-05-23 14:38:38', '1', '2023-05-23 14:38:38', b'0');
  1156 +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 (1240, 1, '套', '6', 'product_unit', 0, '', '', '', '1', '2023-05-23 14:38:38', '1', '2023-05-23 14:38:38', b'0');
  1157 +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 (1241, 1, '包', '7', 'product_unit', 0, '', '', '', '1', '2023-05-23 14:38:38', '1', '2023-05-23 14:38:38', b'0');
  1158 +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 (1242, 1, '双', '8', 'product_unit', 0, '', '', '', '1', '2023-05-23 14:38:38', '1', '2023-05-23 14:38:38', b'0');
  1159 +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 (1243, 1, '卷', '9', 'product_unit', 0, '', '', '', '1', '2023-05-23 14:38:38', '1', '2023-05-23 14:38:38', b'0');
  1160 +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');
  1161 +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');
  1162 +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');
  1163 +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');
  1164 +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');
  1165 +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');
  1166 +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');
  1167 +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');
  1168 +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');
1150 COMMIT; 1169 COMMIT;
1151 1170
1152 -- ---------------------------- 1171 -- ----------------------------
@@ -1167,7 +1186,7 @@ CREATE TABLE `system_dict_type` ( @@ -1167,7 +1186,7 @@ CREATE TABLE `system_dict_type` (
1167 `deleted_time` datetime NULL DEFAULT NULL COMMENT '删除时间', 1186 `deleted_time` datetime NULL DEFAULT NULL COMMENT '删除时间',
1168 PRIMARY KEY (`id`) USING BTREE, 1187 PRIMARY KEY (`id`) USING BTREE,
1169 UNIQUE INDEX `dict_type`(`type` ASC) USING BTREE 1188 UNIQUE INDEX `dict_type`(`type` ASC) USING BTREE
1170 -) ENGINE = InnoDB AUTO_INCREMENT = 169 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典类型表'; 1189 +) ENGINE = InnoDB AUTO_INCREMENT = 173 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '字典类型表';
1171 1190
1172 -- ---------------------------- 1191 -- ----------------------------
1173 -- Records of system_dict_type 1192 -- Records of system_dict_type
@@ -1233,6 +1252,10 @@ INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creat @@ -1233,6 +1252,10 @@ INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creat
1233 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (166, '邮件发送状态', 'system_mail_send_status', 0, '邮件发送状态', '1', '2023-01-26 09:53:13', '1', '2023-01-26 09:53:13', b'0', '1970-01-01 00:00:00'); 1252 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (166, '邮件发送状态', 'system_mail_send_status', 0, '邮件发送状态', '1', '2023-01-26 09:53:13', '1', '2023-01-26 09:53:13', b'0', '1970-01-01 00:00:00');
1234 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (167, '站内信模版的类型', 'system_notify_template_type', 0, '站内信模版的类型', '1', '2023-01-28 10:35:10', '1', '2023-01-28 10:35:10', b'0', '1970-01-01 00:00:00'); 1253 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (167, '站内信模版的类型', 'system_notify_template_type', 0, '站内信模版的类型', '1', '2023-01-28 10:35:10', '1', '2023-01-28 10:35:10', b'0', '1970-01-01 00:00:00');
1235 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (168, '代码生成的前端类型', 'infra_codegen_front_type', 0, '', '1', '2023-04-12 23:57:52', '1', '2023-04-12 23:57:52', b'0', '1970-01-01 00:00:00'); 1254 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (168, '代码生成的前端类型', 'infra_codegen_front_type', 0, '', '1', '2023-04-12 23:57:52', '1', '2023-04-12 23:57:52', b'0', '1970-01-01 00:00:00');
  1255 +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');
  1256 +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');
  1257 +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');
  1258 +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');
1236 COMMIT; 1259 COMMIT;
1237 1260
1238 -- ---------------------------- 1261 -- ----------------------------
@@ -1252,7 +1275,7 @@ CREATE TABLE `system_error_code` ( @@ -1252,7 +1275,7 @@ CREATE TABLE `system_error_code` (
1252 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', 1275 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
1253 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', 1276 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
1254 PRIMARY KEY (`id`) USING BTREE 1277 PRIMARY KEY (`id`) USING BTREE
1255 -) ENGINE = InnoDB AUTO_INCREMENT = 5832 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '错误码表'; 1278 +) ENGINE = InnoDB AUTO_INCREMENT = 5833 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '错误码表';
1256 1279
1257 -- ---------------------------- 1280 -- ----------------------------
1258 -- Records of system_error_code 1281 -- Records of system_error_code
@@ -1281,7 +1304,7 @@ CREATE TABLE `system_login_log` ( @@ -1281,7 +1304,7 @@ CREATE TABLE `system_login_log` (
1281 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', 1304 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
1282 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', 1305 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
1283 PRIMARY KEY (`id`) USING BTREE 1306 PRIMARY KEY (`id`) USING BTREE
1284 -) ENGINE = InnoDB AUTO_INCREMENT = 2163 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '系统访问记录'; 1307 +) ENGINE = InnoDB AUTO_INCREMENT = 2223 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '系统访问记录';
1285 1308
1286 -- ---------------------------- 1309 -- ----------------------------
1287 -- Records of system_login_log 1310 -- Records of system_login_log
@@ -1411,7 +1434,7 @@ CREATE TABLE `system_menu` ( @@ -1411,7 +1434,7 @@ CREATE TABLE `system_menu` (
1411 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', 1434 `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
1412 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', 1435 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
1413 PRIMARY KEY (`id`) USING BTREE 1436 PRIMARY KEY (`id`) USING BTREE
1414 -) ENGINE = InnoDB AUTO_INCREMENT = 2162 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '菜单权限表'; 1437 +) ENGINE = InnoDB AUTO_INCREMENT = 2301 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '菜单权限表';
1415 1438
1416 -- ---------------------------- 1439 -- ----------------------------
1417 -- Records of system_menu 1440 -- Records of system_menu
@@ -1550,7 +1573,6 @@ INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_i @@ -1550,7 +1573,6 @@ INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_i
1550 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 (1128, '支付应用信息创建', 'pay:app:create', 3, 2, 1126, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2021-11-10 01:13:31', '', '2022-04-20 17:03:10', b'0'); 1573 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 (1128, '支付应用信息创建', 'pay:app:create', 3, 2, 1126, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2021-11-10 01:13:31', '', '2022-04-20 17:03:10', b'0');
1551 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 (1129, '支付应用信息更新', 'pay:app:update', 3, 3, 1126, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2021-11-10 01:13:31', '', '2022-04-20 17:03:10', b'0'); 1574 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 (1129, '支付应用信息更新', 'pay:app:update', 3, 3, 1126, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2021-11-10 01:13:31', '', '2022-04-20 17:03:10', b'0');
1552 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 (1130, '支付应用信息删除', 'pay:app:delete', 3, 4, 1126, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2021-11-10 01:13:31', '', '2022-04-20 17:03:10', b'0'); 1575 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 (1130, '支付应用信息删除', 'pay:app:delete', 3, 4, 1126, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2021-11-10 01:13:31', '', '2022-04-20 17:03:10', b'0');
1553 -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 (1131, '支付应用信息导出', 'pay:app:export', 3, 5, 1126, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2021-11-10 01:13:31', '', '2022-04-20 17:03:10', b'0');  
1554 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 (1132, '秘钥解析', 'pay:channel:parsing', 3, 6, 1129, '', '', '', NULL, 0, b'1', b'1', b'1', '1', '2021-11-08 15:15:47', '1', '2022-04-20 17:03:10', b'0'); 1576 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 (1132, '秘钥解析', 'pay:channel:parsing', 3, 6, 1129, '', '', '', NULL, 0, b'1', b'1', b'1', '1', '2021-11-08 15:15:47', '1', '2022-04-20 17:03:10', b'0');
1555 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 (1133, '支付商户信息查询', 'pay:merchant:query', 3, 1, 1132, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2021-11-10 01:13:41', '', '2022-04-20 17:03:10', b'0'); 1577 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 (1133, '支付商户信息查询', 'pay:merchant:query', 3, 1, 1132, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2021-11-10 01:13:41', '', '2022-04-20 17:03:10', b'0');
1556 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 (1134, '支付商户信息创建', 'pay:merchant:create', 3, 2, 1132, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2021-11-10 01:13:41', '', '2022-04-20 17:03:10', b'0'); 1578 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 (1134, '支付商户信息创建', 'pay:merchant:create', 3, 2, 1132, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2021-11-10 01:13:41', '', '2022-04-20 17:03:10', b'0');
@@ -1576,12 +1598,6 @@ INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_i @@ -1576,12 +1598,6 @@ INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_i
1576 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 (1176, '支付订单更新', 'pay:order:update', 3, 3, 1173, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2021-12-25 08:49:43', '', '2022-04-20 17:03:10', b'0'); 1598 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 (1176, '支付订单更新', 'pay:order:update', 3, 3, 1173, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2021-12-25 08:49:43', '', '2022-04-20 17:03:10', b'0');
1577 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 (1177, '支付订单删除', 'pay:order:delete', 3, 4, 1173, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2021-12-25 08:49:43', '', '2022-04-20 17:03:10', b'0'); 1599 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 (1177, '支付订单删除', 'pay:order:delete', 3, 4, 1173, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2021-12-25 08:49:43', '', '2022-04-20 17:03:10', b'0');
1578 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 (1178, '支付订单导出', 'pay:order:export', 3, 5, 1173, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2021-12-25 08:49:43', '', '2022-04-20 17:03:10', b'0'); 1600 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 (1178, '支付订单导出', 'pay:order:export', 3, 5, 1173, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2021-12-25 08:49:43', '', '2022-04-20 17:03:10', b'0');
1579 -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 (1179, '商户信息', '', 2, 0, 1117, 'merchant', 'merchant', 'pay/merchant/index', 'PayApp', 0, b'1', b'1', b'1', '', '2021-12-25 09:01:44', '1', '2023-04-08 10:42:32', b'0');  
1580 -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 (1180, '支付商户信息查询', 'pay:merchant:query', 3, 1, 1179, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2021-12-25 09:01:44', '', '2022-04-20 17:03:10', b'0');  
1581 -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 (1181, '支付商户信息创建', 'pay:merchant:create', 3, 2, 1179, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2021-12-25 09:01:44', '', '2022-04-20 17:03:10', b'0');  
1582 -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 (1182, '支付商户信息更新', 'pay:merchant:update', 3, 3, 1179, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2021-12-25 09:01:44', '', '2022-04-20 17:03:10', b'0');  
1583 -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 (1183, '支付商户信息删除', '', 3, 4, 1179, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2021-12-25 09:01:44', '', '2022-04-20 17:03:10', b'0');  
1584 -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 (1184, '支付商户信息导出', 'pay:merchant:export', 3, 5, 1179, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2021-12-25 09:01:44', '', '2022-04-20 17:03:10', b'0');  
1585 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 (1185, '工作流程', '', 1, 50, 0, '/bpm', 'tool', NULL, NULL, 0, b'1', b'1', b'1', '1', '2021-12-30 20:26:36', '103', '2022-04-20 17:03:10', b'0'); 1601 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 (1185, '工作流程', '', 1, 50, 0, '/bpm', 'tool', NULL, NULL, 0, b'1', b'1', b'1', '1', '2021-12-30 20:26:36', '103', '2022-04-20 17:03:10', b'0');
1586 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 (1186, '流程管理', '', 1, 10, 1185, 'manager', 'nested', NULL, NULL, 0, b'1', b'1', b'1', '1', '2021-12-30 20:28:30', '1', '2022-04-20 17:03:10', b'0'); 1602 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 (1186, '流程管理', '', 1, 10, 1185, 'manager', 'nested', NULL, NULL, 0, b'1', b'1', b'1', '1', '2021-12-30 20:28:30', '1', '2022-04-20 17:03:10', b'0');
1587 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 (1187, '流程表单', '', 2, 0, 1186, 'form', 'form', 'bpm/form/index', 'BpmForm', 0, b'1', b'1', b'1', '', '2021-12-30 12:38:22', '1', '2023-04-08 10:50:37', b'0'); 1603 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 (1187, '流程表单', '', 2, 0, 1186, 'form', 'form', 'bpm/form/index', 'BpmForm', 0, b'1', b'1', b'1', '', '2021-12-30 12:38:22', '1', '2023-04-08 10:50:37', b'0');
@@ -1692,118 +1708,26 @@ INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_i @@ -1692,118 +1708,26 @@ INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_i
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 (2046, '满减送活动关闭', 'promotion:reward-activity:close', 3, 5, 2041, '', '', '', NULL, 0, b'1', b'1', b'1', '1', '2022-11-05 10:42:53', '1', '2022-11-05 10:42:53', b'0'); 1708 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 (2046, '满减送活动关闭', 'promotion:reward-activity:close', 3, 5, 2041, '', '', '', NULL, 0, b'1', b'1', b'1', '1', '2022-11-05 10:42:53', '1', '2022-11-05 10:42:53', b'0');
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 (2047, '限时折扣活动', '', 2, 7, 2030, 'discount-activity', 'time', 'mall/promotion/discountActivity/index', 'PromotionDiscountActivity', 0, b'1', b'1', b'1', '', '2022-11-05 17:12:15', '1', '2023-04-08 11:45:44', b'0'); 1709 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 (2047, '限时折扣活动', '', 2, 7, 2030, 'discount-activity', 'time', 'mall/promotion/discountActivity/index', 'PromotionDiscountActivity', 0, b'1', b'1', b'1', '', '2022-11-05 17:12:15', '1', '2023-04-08 11:45:44', b'0');
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 (2048, '限时折扣活动查询', 'promotion:discount-activity:query', 3, 1, 2047, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2022-11-05 17:12:15', '', '2022-11-05 17:12:15', b'0'); 1710 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 (2048, '限时折扣活动查询', 'promotion:discount-activity:query', 3, 1, 2047, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2022-11-05 17:12:15', '', '2022-11-05 17:12:15', b'0');
1695 -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`,  
1696 - `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`,  
1697 - `updater`, `update_time`, `deleted`)  
1698 -VALUES (2049, '限时折扣活动创建', 'promotion:discount-activity:create', 3, 2, 2047, '', '', '', NULL, 0, b'1', b'1',  
1699 - b'1', '', '2022-11-05 17:12:15', '', '2022-11-05 17:12:15', b'0');  
1700 -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`,  
1701 - `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`,  
1702 - `updater`, `update_time`, `deleted`)  
1703 -VALUES (2050, '限时折扣活动更新', 'promotion:discount-activity:update', 3, 3, 2047, '', '', '', NULL, 0, b'1', b'1',  
1704 - b'1', '', '2022-11-05 17:12:16', '', '2022-11-05 17:12:16', b'0');  
1705 -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`,  
1706 - `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`,  
1707 - `updater`, `update_time`, `deleted`)  
1708 -VALUES (2051, '限时折扣活动删除', 'promotion:discount-activity:delete', 3, 4, 2047, '', '', '', NULL, 0, b'1', b'1',  
1709 - b'1', '', '2022-11-05 17:12:16', '', '2022-11-05 17:12:16', b'0');  
1710 -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`,  
1711 - `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`,  
1712 - `updater`, `update_time`, `deleted`)  
1713 -VALUES (2052, '限时折扣活动关闭', 'promotion:discount-activity:close', 3, 5, 2047, '', '', '', NULL, 0, b'1', b'1',  
1714 - b'1', '', '2022-11-05 17:12:16', '', '2022-11-05 17:12:16', b'0');  
1715 -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`,  
1716 - `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`,  
1717 - `updater`, `update_time`, `deleted`)  
1718 -VALUES (2059, '秒杀活动管理', '', 2, 0, 2030, 'seckill-activity', 'time-range',  
1719 - 'mall/promotion/seckill/seckillActivity/index', 'PromotionSeckillActivity', 0, b'1', b'1', b'1', '',  
1720 - '2022-11-06 22:24:49', '1', '2023-04-08 11:46:02', b'0');  
1721 -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`,  
1722 - `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`,  
1723 - `updater`, `update_time`, `deleted`)  
1724 -VALUES (2060, '秒杀活动查询', 'promotion:seckill-activity:query', 3, 1, 2059, '', '', '', NULL, 0, b'1', b'1', b'1', '',  
1725 - '2022-11-06 22:24:49', '', '2022-11-06 22:24:49', b'0');  
1726 -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`,  
1727 - `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`,  
1728 - `updater`, `update_time`, `deleted`)  
1729 -VALUES (2061, '秒杀活动创建', 'promotion:seckill-activity:create', 3, 2, 2059, '', '', '', NULL, 0, b'1', b'1', b'1',  
1730 - '', '2022-11-06 22:24:49', '', '2022-11-06 22:24:49', b'0');  
1731 -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`,  
1732 - `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`,  
1733 - `updater`, `update_time`, `deleted`)  
1734 -VALUES (2062, '秒杀活动更新', 'promotion:seckill-activity:update', 3, 3, 2059, '', '', '', NULL, 0, b'1', b'1', b'1',  
1735 - '', '2022-11-06 22:24:49', '', '2022-11-06 22:24:49', b'0');  
1736 -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`,  
1737 - `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`,  
1738 - `updater`, `update_time`, `deleted`)  
1739 -VALUES (2063, '秒杀活动删除', 'promotion:seckill-activity:delete', 3, 4, 2059, '', '', '', NULL, 0, b'1', b'1', b'1',  
1740 - '', '2022-11-06 22:24:49', '', '2022-11-06 22:24:49', b'0');  
1741 -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`,  
1742 - `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`,  
1743 - `updater`, `update_time`, `deleted`)  
1744 -VALUES (2064, '秒杀活动导出', 'promotion:seckill-activity:export', 3, 5, 2059, '', '', '', NULL, 0, b'1', b'1', b'1',  
1745 - '', '2022-11-06 22:24:49', '', '2022-11-06 22:24:49', b'0');  
1746 -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`,  
1747 - `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`,  
1748 - `updater`, `update_time`, `deleted`)  
1749 -VALUES (2066, '秒杀时段管理', '', 2, 0, 2030, 'seckill-time', '', 'mall/promotion/seckill/SeckillConfig/index',  
1750 - 'PromotionSeckillConfig', 0, b'0', b'1', b'1', '', '2022-11-15 19:46:50', '1', '2023-04-08 11:46:17', b'0');  
1751 -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`,  
1752 - `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`,  
1753 - `updater`, `update_time`, `deleted`)  
1754 -VALUES (2067, '秒杀时段查询', 'promotion:seckill-time:query', 3, 1, 2066, '', '', '', NULL, 0, b'1', b'1', b'1', '',  
1755 - '2022-11-15 19:46:51', '', '2022-11-15 19:46:51', b'0');  
1756 -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`,  
1757 - `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`,  
1758 - `updater`, `update_time`, `deleted`)  
1759 -VALUES (2068, '秒杀时段创建', 'promotion:seckill-time:create', 3, 2, 2066, '', '', '', NULL, 0, b'1', b'1', b'1', '',  
1760 - '2022-11-15 19:46:51', '', '2022-11-15 19:46:51', b'0');  
1761 -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`,  
1762 - `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`,  
1763 - `updater`, `update_time`, `deleted`)  
1764 -VALUES (2069, '秒杀时段更新', 'promotion:seckill-time:update', 3, 3, 2066, '', '', '', NULL, 0, b'1', b'1', b'1', '',  
1765 - '2022-11-15 19:46:51', '', '2022-11-15 19:46:51', b'0');  
1766 -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`,  
1767 - `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`,  
1768 - `updater`, `update_time`, `deleted`)  
1769 -VALUES (2070, '秒杀时段删除', 'promotion:seckill-time:delete', 3, 4, 2066, '', '', '', NULL, 0, b'1', b'1', b'1', '',  
1770 - '2022-11-15 19:46:51', '', '2022-11-15 19:46:51', b'0');  
1771 -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`,  
1772 - `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`,  
1773 - `updater`, `update_time`, `deleted`)  
1774 -VALUES (2071, '秒杀时段导出', 'promotion:seckill-time:export', 3, 5, 2066, '', '', '', NULL, 0, b'1', b'1', b'1', '',  
1775 - '2022-11-15 19:46:51', '', '2022-11-15 19:46:51', b'0');  
1776 -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`,  
1777 - `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`,  
1778 - `updater`, `update_time`, `deleted`)  
1779 -VALUES (2072, '订单中心', '', 1, 65, 0, '/trade', 'order', NULL, NULL, 0, b'1', b'1', b'1', '1', '2022-11-19 18:57:19',  
1780 - '1', '2022-12-10 16:32:57', b'0');  
1781 -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`,  
1782 - `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`,  
1783 - `updater`, `update_time`, `deleted`)  
1784 -VALUES (2073, '售后退款', '', 2, 1, 2072, 'trade/after-sale', 'education', 'mall/trade/afterSale/index',  
1785 - 'TradeAfterSale', 0, b'1', b'1', b'1', '', '2022-11-19 20:15:32', '1', '2023-04-08 11:43:19', b'0');  
1786 -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`,  
1787 - `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`,  
1788 - `updater`, `update_time`, `deleted`)  
1789 -VALUES (2074, '售后查询', 'trade:after-sale:query', 3, 1, 2073, '', '', '', NULL, 0, b'1', b'1', b'1', '',  
1790 - '2022-11-19 20:15:33', '1', '2022-12-10 21:04:29', b'0');  
1791 -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`,  
1792 - `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`,  
1793 - `updater`, `update_time`, `deleted`)  
1794 -VALUES (2075, '秒杀活动关闭', 'promotion:sekill-activity:close', 3, 6, 2059, '', '', '', NULL, 0, b'1', b'1', b'1', '1',  
1795 - '2022-11-28 20:20:15', '1', '2022-11-28 20:20:15', b'0');  
1796 -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`,  
1797 - `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`,  
1798 - `updater`, `update_time`, `deleted`)  
1799 -VALUES (2076, '订单列表', '', 2, 0, 2072, 'trade/order', 'list', 'mall/trade/order/index', 'TradeOrder', 0, b'1', b'1',  
1800 - b'1', '1', '2022-12-10 21:05:44', '1', '2023-04-08 11:42:23', b'0');  
1801 -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 (2077, '物流公司管理管理', '', 2, 0, 2072, 'express-company', '', 'mall/trade/expressCompany/index', NULL, 0, b'1', b'1', b'1', '', '2022-12-20 23:27:55', '1', '2022-12-20 23:36:20', b'0');  
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 (2078, '物流公司管理查询', 'trade:express-company:query', 3, 1, 2077, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2022-12-20 23:27:55', '', '2022-12-20 23:27:55', b'0');  
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 (2079, '物流公司管理创建', 'trade:express-company:create', 3, 2, 2077, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2022-12-20 23:27:55', '', '2022-12-20 23:27:55', b'0');  
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 (2080, '物流公司管理更新', 'trade:express-company:update', 3, 3, 2077, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2022-12-20 23:27:55', '', '2022-12-20 23:27:55', 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 (2081, '物流公司管理删除', 'trade:express-company:delete', 3, 4, 2077, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2022-12-20 23:27:55', '', '2022-12-20 23:27:55', 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 (2082, '物流公司管理导出', 'trade:express-company:export', 3, 5, 2077, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2022-12-20 23:27:55', '', '2022-12-20 23:27:55', b'0'); 1711 +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 (2049, '限时折扣活动创建', 'promotion:discount-activity:create', 3, 2, 2047, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2022-11-05 17:12:15', '', '2022-11-05 17:12:15', b'0');
  1712 +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 (2050, '限时折扣活动更新', 'promotion:discount-activity:update', 3, 3, 2047, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2022-11-05 17:12:16', '', '2022-11-05 17:12:16', b'0');
  1713 +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 (2051, '限时折扣活动删除', 'promotion:discount-activity:delete', 3, 4, 2047, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2022-11-05 17:12:16', '', '2022-11-05 17:12:16', b'0');
  1714 +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 (2052, '限时折扣活动关闭', 'promotion:discount-activity:close', 3, 5, 2047, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2022-11-05 17:12:16', '', '2022-11-05 17:12:16', b'0');
  1715 +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 (2059, '秒杀商品', '', 2, 2, 2209, 'activity', 'ep:basketball', 'mall/promotion/seckill/activity/index', 'PromotionSeckillActivity', 0, b'1', b'1', b'1', '', '2022-11-06 22:24:49', '1', '2023-06-24 18:57:25', b'0');
  1716 +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 (2060, '秒杀活动查询', 'promotion:seckill-activity:query', 3, 1, 2059, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2022-11-06 22:24:49', '', '2022-11-06 22:24:49', b'0');
  1717 +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');
  1718 +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');
  1719 +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');
  1720 +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');
  1721 +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');
  1722 +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');
  1723 +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');
  1724 +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 (2069, '秒杀时段更新', 'promotion:seckill-config:update', 3, 3, 2066, '', '', '', '', 0, b'1', b'1', b'1', '', '2022-11-15 19:46:51', '1', '2023-06-24 17:50:29', b'0');
  1725 +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 (2070, '秒杀时段删除', 'promotion:seckill-config:delete', 3, 4, 2066, '', '', '', '', 0, b'1', b'1', b'1', '', '2022-11-15 19:46:51', '1', '2023-06-24 17:50:32', b'0');
  1726 +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');
  1727 +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');
  1728 +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');
  1729 +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');
  1730 +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');
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 (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'); 1731 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');
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 (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'); 1732 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');
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 (2085, '账号管理', '', 2, 1, 2084, 'account', 'phone', 'mp/account/index', 'MpAccount', 0, b'1', b'1', b'1', '1', '2023-01-01 20:13:31', '1', '2023-02-09 23:56:39', b'0'); 1733 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 (2085, '账号管理', '', 2, 1, 2084, 'account', 'phone', 'mp/account/index', 'MpAccount', 0, b'1', b'1', b'1', '1', '2023-01-01 20:13:31', '1', '2023-02-09 23:56:39', b'0');
@@ -1883,6 +1807,45 @@ INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_i @@ -1883,6 +1807,45 @@ INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_i
1883 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 (2159, 'Boot 开发文档', '', 1, 1, 0, 'https://doc.iocoder.cn/', 'education', NULL, NULL, 0, b'1', b'1', b'1', '1', '2023-02-10 22:46:28', '1', '2023-02-10 22:46:28', 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 (2159, 'Boot 开发文档', '', 1, 1, 0, 'https://doc.iocoder.cn/', 'education', NULL, NULL, 0, b'1', b'1', b'1', '1', '2023-02-10 22:46:28', '1', '2023-02-10 22:46:28', b'0');
1884 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 (2160, 'Cloud 开发文档', '', 1, 2, 0, 'https://cloud.iocoder.cn', 'documentation', NULL, NULL, 0, b'1', b'1', b'1', '1', '2023-02-10 22:47:07', '1', '2023-02-10 22:47:07', 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 (2160, 'Cloud 开发文档', '', 1, 2, 0, 'https://cloud.iocoder.cn', 'documentation', NULL, NULL, 0, b'1', b'1', b'1', '1', '2023-02-10 22:47:07', '1', '2023-02-10 22:47:07', b'0');
1885 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 (2161, '接入示例', '', 2, 99, 1117, 'demo-order', 'drag', 'pay/demo/index', NULL, 0, b'1', b'1', b'1', '', '2023-02-11 14:21:42', '1', '2023-02-11 22:26:35', 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 (2161, '接入示例', '', 2, 99, 1117, 'demo-order', 'drag', 'pay/demo/index', NULL, 0, b'1', b'1', b'1', '', '2023-02-11 14:21:42', '1', '2023-02-11 22:26:35', 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 (2162, '商品导出', 'product:spu:export', 3, 5, 2014, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2022-07-30 14:22:58', '', '2022-07-30 14:22:58', 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 (2164, '配送管理', '', 1, 2, 2072, 'delivery', '', '', '', 0, b'1', b'1', b'1', '1', '2023-05-18 09:18:02', '1', '2023-05-24 23:24:13', 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 (2165, '快递发货', '', 1, 0, 2164, 'express', '', '', '', 0, b'1', b'1', b'1', '1', '2023-05-18 09:22:06', '1', '2023-05-18 09:22:06', 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 (2166, '门店自提', '', 1, 1, 2164, 'pick-up-store', '', '', '', 0, b'1', b'1', b'1', '1', '2023-05-18 09:23:14', '1', '2023-05-18 09:23:14', 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 (2167, '快递公司', '', 2, 0, 2165, 'express', '', 'mall/trade/delivery/express/index', 'Express', 0, b'1', b'1', b'1', '1', '2023-05-18 09:27:21', '1', '2023-05-18 22:11:14', 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 (2168, '快递公司查询', 'trade:delivery:express:query', 3, 1, 2167, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-05-18 09:37:53', '', '2023-05-18 09:37:53', 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 (2169, '快递公司创建', 'trade:delivery:express:create', 3, 2, 2167, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-05-18 09:37:53', '', '2023-05-18 09:37:53', 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 (2170, '快递公司更新', 'trade:delivery:express:update', 3, 3, 2167, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-05-18 09:37:53', '', '2023-05-18 09:37:53', 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 (2171, '快递公司删除', 'trade:delivery:express:delete', 3, 4, 2167, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-05-18 09:37:53', '', '2023-05-18 09:37:53', 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 (2172, '快递公司导出', 'trade:delivery:express:export', 3, 5, 2167, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-05-18 09:37:53', '', '2023-05-18 09:37:53', 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 (2173, '运费模版', 'trade:delivery:express-template:query', 2, 1, 2165, 'express-template', '', 'mall/trade/delivery/expressTemplate/index', 'ExpressTemplate', 0, b'1', b'1', b'1', '1', '2023-05-20 06:48:10', '1', '2023-05-20 06:48:29', b'0');
  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 (2174, '快递运费模板查询', 'trade:delivery:express-template:query', 3, 1, 2173, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-05-20 06:49:53', '', '2023-05-20 06:49:53', b'0');
  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 (2175, '快递运费模板创建', 'trade:delivery:express-template:create', 3, 2, 2173, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-05-20 06:49:53', '', '2023-05-20 06:49:53', 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 (2176, '快递运费模板更新', 'trade:delivery:express-template:update', 3, 3, 2173, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-05-20 06:49:53', '', '2023-05-20 06:49:53', 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 (2177, '快递运费模板删除', 'trade:delivery:express-template:delete', 3, 4, 2173, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-05-20 06:49:53', '', '2023-05-20 06:49:53', 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 (2178, '快递运费模板导出', 'trade:delivery:express-template:export', 3, 5, 2173, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-05-20 06:49:53', '', '2023-05-20 06:49:53', 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 (2179, '门店管理', '', 2, 1, 2166, 'pick-up-store', '', 'mall/trade/delivery/pickUpStore/index', 'PickUpStore', 0, b'1', b'1', b'1', '1', '2023-05-25 10:50:00', '1', '2023-05-25 10:50:00', 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 (2180, '自提门店查询', 'trade:delivery:pick-up-store:query', 3, 1, 2179, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-05-25 10:53:29', '', '2023-05-25 10:53:29', 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 (2181, '自提门店创建', 'trade:delivery:pick-up-store:create', 3, 2, 2179, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-05-25 10:53:29', '', '2023-05-25 10:53:29', 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 (2182, '自提门店更新', 'trade:delivery:pick-up-store:update', 3, 3, 2179, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2023-05-25 10:53:29', '', '2023-05-25 10:53:29', 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 (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');
  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 (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');
  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 (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');
  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 (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');
  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 (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');
  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 (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');
  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 (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');
  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 (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');
  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 (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');
  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 (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');
  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 (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');
  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 (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');
  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 (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');
  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 (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');
  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 (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');
  1845 +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');
  1846 +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');
  1847 +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');
  1848 +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');
1886 COMMIT; 1849 COMMIT;
1887 1850
1888 -- ---------------------------- 1851 -- ----------------------------
@@ -1999,7 +1962,7 @@ CREATE TABLE `system_oauth2_access_token` ( @@ -1999,7 +1962,7 @@ CREATE TABLE `system_oauth2_access_token` (
1999 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', 1962 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
2000 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', 1963 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
2001 PRIMARY KEY (`id`) USING BTREE 1964 PRIMARY KEY (`id`) USING BTREE
2002 -) ENGINE = InnoDB AUTO_INCREMENT = 1785 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OAuth2 访问令牌'; 1965 +) ENGINE = InnoDB AUTO_INCREMENT = 2007 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OAuth2 访问令牌';
2003 1966
2004 -- ---------------------------- 1967 -- ----------------------------
2005 -- Records of system_oauth2_access_token 1968 -- Records of system_oauth2_access_token
@@ -2121,7 +2084,7 @@ CREATE TABLE `system_oauth2_refresh_token` ( @@ -2121,7 +2084,7 @@ CREATE TABLE `system_oauth2_refresh_token` (
2121 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', 2084 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
2122 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', 2085 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
2123 PRIMARY KEY (`id`) USING BTREE 2086 PRIMARY KEY (`id`) USING BTREE
2124 -) ENGINE = InnoDB AUTO_INCREMENT = 738 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OAuth2 刷新令牌'; 2087 +) ENGINE = InnoDB AUTO_INCREMENT = 785 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'OAuth2 刷新令牌';
2125 2088
2126 -- ---------------------------- 2089 -- ----------------------------
2127 -- Records of system_oauth2_refresh_token 2090 -- Records of system_oauth2_refresh_token
@@ -2161,7 +2124,7 @@ CREATE TABLE `system_operate_log` ( @@ -2161,7 +2124,7 @@ CREATE TABLE `system_operate_log` (
2161 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', 2124 `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
2162 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号', 2125 `tenant_id` bigint NOT NULL DEFAULT 0 COMMENT '租户编号',
2163 PRIMARY KEY (`id`) USING BTREE 2126 PRIMARY KEY (`id`) USING BTREE
2164 -) ENGINE = InnoDB AUTO_INCREMENT = 6440 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '操作日志记录'; 2127 +) ENGINE = InnoDB AUTO_INCREMENT = 6601 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '操作日志记录';
2165 2128
2166 -- ---------------------------- 2129 -- ----------------------------
2167 -- Records of system_operate_log 2130 -- Records of system_operate_log
@@ -2743,7 +2706,6 @@ INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_t @@ -2743,7 +2706,6 @@ INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_t
2743 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2062, 2, 1128, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1); 2706 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2062, 2, 1128, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
2744 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2063, 2, 1129, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1); 2707 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2063, 2, 1129, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
2745 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2064, 2, 1130, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1); 2708 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2064, 2, 1130, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
2746 -INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2065, 2, 1131, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);  
2747 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2066, 2, 1132, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1); 2709 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2066, 2, 1132, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
2748 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2067, 2, 1133, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1); 2710 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2067, 2, 1133, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
2749 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2068, 2, 1134, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1); 2711 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2068, 2, 1134, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
@@ -2771,12 +2733,6 @@ INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_t @@ -2771,12 +2733,6 @@ INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_t
2771 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2090, 2, 1176, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1); 2733 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2090, 2, 1176, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
2772 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2091, 2, 1177, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1); 2734 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2091, 2, 1177, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
2773 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2092, 2, 1178, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1); 2735 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2092, 2, 1178, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
2774 -INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2093, 2, 1179, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);  
2775 -INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2094, 2, 1180, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);  
2776 -INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2095, 2, 1181, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);  
2777 -INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2096, 2, 1182, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);  
2778 -INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2097, 2, 1183, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);  
2779 -INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2098, 2, 1184, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);  
2780 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2099, 2, 1226, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1); 2736 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2099, 2, 1226, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
2781 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2100, 2, 1227, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1); 2737 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2100, 2, 1227, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
2782 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2101, 2, 1228, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1); 2738 INSERT INTO `system_role_menu` (`id`, `role_id`, `menu_id`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2101, 2, 1228, '1', '2023-01-25 08:42:52', '1', '2023-01-25 08:42:52', b'0', 1);
@@ -3321,7 +3277,7 @@ CREATE TABLE `system_tenant` ( @@ -3321,7 +3277,7 @@ CREATE TABLE `system_tenant` (
3321 BEGIN; 3277 BEGIN;
3322 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'); 3278 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');
3323 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'); 3279 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');
3324 -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', '2022-03-07 21:37:58', b'0'); 3280 +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');
3325 COMMIT; 3281 COMMIT;
3326 3282
3327 -- ---------------------------- 3283 -- ----------------------------
@@ -3459,7 +3415,7 @@ CREATE TABLE `system_users` ( @@ -3459,7 +3415,7 @@ CREATE TABLE `system_users` (
3459 -- Records of system_users 3415 -- Records of system_users
3460 -- ---------------------------- 3416 -- ----------------------------
3461 BEGIN; 3417 BEGIN;
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 (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-04-13 23:09:16', 'admin', '2021-01-05 17:03:47', NULL, '2023-04-13 23:09:16', b'0', 1); 3418 +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-09 12:19:37', 'admin', '2021-01-05 17:03:47', NULL, '2023-07-09 12:19:37', b'0', 1);
3463 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); 3419 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);
3464 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); 3420 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);
3465 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); 3421 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);
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/aftersale/TradeAfterSaleConvert.java
  View file @2485a5e
@@ -38,7 +38,7 @@ public interface TradeAfterSaleConvert { @@ -38,7 +38,7 @@ public interface TradeAfterSaleConvert {
38 38
39 @Mappings({ 39 @Mappings({
40 @Mapping(source = "afterSale.applyReason", target = "reason"), 40 @Mapping(source = "afterSale.applyReason", target = "reason"),
41 - @Mapping(source = "afterSale.refundPrice", target = "amount") 41 + @Mapping(source = "afterSale.refundPrice", target = "price")
42 }) 42 })
43 PayRefundCreateReqDTO convert(String userIp, TradeAfterSaleDO afterSale, 43 PayRefundCreateReqDTO convert(String userIp, TradeAfterSaleDO afterSale,
44 TradeOrderProperties orderProperties); 44 TradeOrderProperties orderProperties);
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/order/TradeOrderConvert.java
  View file @2485a5e
@@ -106,7 +106,7 @@ public interface TradeOrderConvert { @@ -106,7 +106,7 @@ public interface TradeOrderConvert {
106 createReqDTO.setSubject(subject); 106 createReqDTO.setSubject(subject);
107 createReqDTO.setBody(subject); // TODO 芋艿：临时写死 107 createReqDTO.setBody(subject); // TODO 芋艿：临时写死
108 // 订单相关字段 108 // 订单相关字段
109 - createReqDTO.setAmount(order.getPayPrice()).setExpireTime(addTime(orderProperties.getExpireTime())); 109 + createReqDTO.setPrice(order.getPayPrice()).setExpireTime(addTime(orderProperties.getExpireTime()));
110 return createReqDTO; 110 return createReqDTO;
111 } 111 }
112 112
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceImpl.java
  View file @2485a5e
@@ -317,7 +317,7 @@ public class TradeOrderServiceImpl implements TradeOrderService { @@ -317,7 +317,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
317 throw exception(ORDER_UPDATE_PAID_FAIL_PAY_ORDER_STATUS_NOT_SUCCESS); 317 throw exception(ORDER_UPDATE_PAID_FAIL_PAY_ORDER_STATUS_NOT_SUCCESS);
318 } 318 }
319 // 校验支付金额一致 319 // 校验支付金额一致
320 - if (ObjectUtil.notEqual(payOrder.getAmount(), order.getPayPrice())) { 320 + if (ObjectUtil.notEqual(payOrder.getPrice(), order.getPayPrice())) {
321 log.error("[validateOrderPaid][order({}) payOrder({}) 支付金额不匹配，请进行处理！order 数据是：{}，payOrder 数据是：{}]", 321 log.error("[validateOrderPaid][order({}) payOrder({}) 支付金额不匹配，请进行处理！order 数据是：{}，payOrder 数据是：{}]",
322 id, payOrderId, JsonUtils.toJsonString(order), JsonUtils.toJsonString(payOrder)); 322 id, payOrderId, JsonUtils.toJsonString(order), JsonUtils.toJsonString(payOrder));
323 throw exception(ORDER_UPDATE_PAID_FAIL_PAY_PRICE_NOT_MATCH); 323 throw exception(ORDER_UPDATE_PAID_FAIL_PAY_PRICE_NOT_MATCH);
yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderServiceTest.java
  View file @2485a5e
@@ -144,7 +144,7 @@ public class TradeOrderServiceTest extends BaseDbUnitTest { @@ -144,7 +144,7 @@ public class TradeOrderServiceTest extends BaseDbUnitTest {
144 assertNotNull(createReqDTO.getMerchantOrderId()); // 由于 tradeOrderId 后生成，只能校验非空 144 assertNotNull(createReqDTO.getMerchantOrderId()); // 由于 tradeOrderId 后生成，只能校验非空
145 assertEquals(createReqDTO.getSubject(), "商品 1 等多件"); 145 assertEquals(createReqDTO.getSubject(), "商品 1 等多件");
146 assertNull(createReqDTO.getBody()); 146 assertNull(createReqDTO.getBody());
147 - assertEquals(createReqDTO.getAmount(), 80); 147 + assertEquals(createReqDTO.getPrice(), 80);
148 assertNotNull(createReqDTO.getExpireTime()); 148 assertNotNull(createReqDTO.getExpireTime());
149 return true; 149 return true;
150 }))).thenReturn(1000L); 150 }))).thenReturn(1000L);
@@ -257,7 +257,7 @@ public class TradeOrderServiceTest extends BaseDbUnitTest { @@ -257,7 +257,7 @@ public class TradeOrderServiceTest extends BaseDbUnitTest {
257 // mock 方法（支付单） 257 // mock 方法（支付单）
258 when(payOrderApi.getOrder(eq(10L))).thenReturn(randomPojo(PayOrderRespDTO.class, 258 when(payOrderApi.getOrder(eq(10L))).thenReturn(randomPojo(PayOrderRespDTO.class,
259 o -> o.setStatus(PayOrderStatusEnum.SUCCESS.getStatus()).setChannelCode("wx_pub") 259 o -> o.setStatus(PayOrderStatusEnum.SUCCESS.getStatus()).setChannelCode("wx_pub")
260 - .setMerchantOrderId("1")).setAmount(100)); 260 + .setMerchantOrderId("1")).setPrice(100));
261 261
262 // 调用 262 // 调用
263 tradeOrderService.updateOrderPaid(id, payOrderId); 263 tradeOrderService.updateOrderPaid(id, payOrderId);
yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/order/dto/PayOrderCreateReqDTO.java
  View file @2485a5e
@@ -42,7 +42,6 @@ public class PayOrderCreateReqDTO implements Serializable { @@ -42,7 +42,6 @@ public class PayOrderCreateReqDTO implements Serializable {
42 /** 42 /**
43 * 商品描述 43 * 商品描述
44 */ 44 */
45 -// @NotEmpty(message = "商品描述信息不能为空")  
46 @Length(max = 128, message = "商品描述信息长度不能超过128") 45 @Length(max = 128, message = "商品描述信息长度不能超过128")
47 private String body; 46 private String body;
48 47
@@ -53,7 +52,7 @@ public class PayOrderCreateReqDTO implements Serializable { @@ -53,7 +52,7 @@ public class PayOrderCreateReqDTO implements Serializable {
53 */ 52 */
54 @NotNull(message = "支付金额不能为空") 53 @NotNull(message = "支付金额不能为空")
55 @DecimalMin(value = "0", inclusive = false, message = "支付金额必须大于零") 54 @DecimalMin(value = "0", inclusive = false, message = "支付金额必须大于零")
56 - private Integer amount; 55 + private Integer price;
57 56
58 /** 57 /**
59 * 支付过期时间 58 * 支付过期时间
yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/order/dto/PayOrderRespDTO.java
  View file @2485a5e
@@ -35,7 +35,7 @@ public class PayOrderRespDTO { @@ -35,7 +35,7 @@ public class PayOrderRespDTO {
35 /** 35 /**
36 * 支付金额，单位：分 36 * 支付金额，单位：分
37 */ 37 */
38 - private Integer amount; 38 + private Integer price;
39 /** 39 /**
40 * 支付状态 40 * 支付状态
41 * 41 *
yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/refund/dto/PayRefundCreateReqDTO.java
  View file @2485a5e
@@ -48,5 +48,5 @@ public class PayRefundCreateReqDTO { @@ -48,5 +48,5 @@ public class PayRefundCreateReqDTO {
48 */ 48 */
49 @NotNull(message = "退款金额不能为空") 49 @NotNull(message = "退款金额不能为空")
50 @Min(value = 1, message = "退款金额必须大于零") 50 @Min(value = 1, message = "退款金额必须大于零")
51 - private Integer amount; 51 + private Integer price;
52 } 52 }
yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/refund/dto/PayRefundRespDTO.java
  View file @2485a5e
@@ -30,7 +30,7 @@ public class PayRefundRespDTO { @@ -30,7 +30,7 @@ public class PayRefundRespDTO {
30 /** 30 /**
31 * 退款金额，单位：分 31 * 退款金额，单位：分
32 */ 32 */
33 - private Integer refundAmount; 33 + private Integer refundPrice;
34 34
35 // ========== 商户相关字段 ========== 35 // ========== 商户相关字段 ==========
36 /** 36 /**
yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/ErrorCodeConstants.java
  View file @2485a5e
@@ -31,16 +31,12 @@ public interface ErrorCodeConstants { @@ -31,16 +31,12 @@ public interface ErrorCodeConstants {
31 ErrorCode PAY_ORDER_EXTENSION_STATUS_IS_NOT_WAITING = new ErrorCode(1007003001, "支付交易拓展单不处于待支付"); 31 ErrorCode PAY_ORDER_EXTENSION_STATUS_IS_NOT_WAITING = new ErrorCode(1007003001, "支付交易拓展单不处于待支付");
32 32
33 // ========== 支付模块(退款) 1007006000 ========== 33 // ========== 支付模块(退款) 1007006000 ==========
34 - ErrorCode PAY_REFUND_AMOUNT_EXCEED = new ErrorCode(1007006000, "退款金额超过订单可退款金额"); 34 + ErrorCode PAY_PRICE_PRICE_EXCEED = new ErrorCode(1007006000, "退款金额超过订单可退款金额");
35 ErrorCode PAY_REFUND_ALL_REFUNDED = new ErrorCode(1007006001, "订单已经全额退款"); 35 ErrorCode PAY_REFUND_ALL_REFUNDED = new ErrorCode(1007006001, "订单已经全额退款");
36 ErrorCode PAY_REFUND_CHN_ORDER_NO_IS_NULL = new ErrorCode(1007006002, "该订单的渠道订单为空"); 36 ErrorCode PAY_REFUND_CHN_ORDER_NO_IS_NULL = new ErrorCode(1007006002, "该订单的渠道订单为空");
37 ErrorCode PAY_REFUND_SUCCEED = new ErrorCode(1007006003, "已经退款成功"); 37 ErrorCode PAY_REFUND_SUCCEED = new ErrorCode(1007006003, "已经退款成功");
38 ErrorCode PAY_REFUND_NOT_FOUND = new ErrorCode(1007006004, "支付退款单不存在"); 38 ErrorCode PAY_REFUND_NOT_FOUND = new ErrorCode(1007006004, "支付退款单不存在");
39 39
40 - // ========== 支付商户信息 1007004000 ==========  
41 - ErrorCode PAY_MERCHANT_NOT_EXISTS = new ErrorCode(1007004000, "支付商户信息不存在");  
42 - ErrorCode PAY_MERCHANT_EXIST_APP_CANT_DELETE = new ErrorCode(1007004001, "支付商户存在支付应用,无法删除");  
43 -  
44 // ========== 示例订单 1007900000 ========== 40 // ========== 示例订单 1007900000 ==========
45 ErrorCode PAY_DEMO_ORDER_NOT_FOUND = new ErrorCode(1007900000, "示例订单不存在"); 41 ErrorCode PAY_DEMO_ORDER_NOT_FOUND = new ErrorCode(1007900000, "示例订单不存在");
46 ErrorCode PAY_DEMO_ORDER_UPDATE_PAID_STATUS_NOT_UNPAID = new ErrorCode(1007900001, "示例订单更新支付状态失败，订单不是【未支付】状态"); 42 ErrorCode PAY_DEMO_ORDER_UPDATE_PAID_STATUS_NOT_UNPAID = new ErrorCode(1007900001, "示例订单更新支付状态失败，订单不是【未支付】状态");
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/demo/vo/PayDemoOrderRespVO.java
  View file @2485a5e
@@ -28,7 +28,7 @@ public class PayDemoOrderRespVO { @@ -28,7 +28,7 @@ public class PayDemoOrderRespVO {
28 private Integer price; 28 private Integer price;
29 29
30 @Schema(description = "是否已支付", requiredMode = Schema.RequiredMode.REQUIRED) 30 @Schema(description = "是否已支付", requiredMode = Schema.RequiredMode.REQUIRED)
31 - private Boolean payed; 31 + private Boolean payStatus;
32 32
33 @Schema(description = "支付订单编号", example = "16863") 33 @Schema(description = "支付订单编号", example = "16863")
34 private Long payOrderId; 34 private Long payOrderId;
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/order/vo/PayOrderBaseVO.java
  View file @2485a5e
@@ -49,17 +49,13 @@ public class PayOrderBaseVO { @@ -49,17 +49,13 @@ public class PayOrderBaseVO {
49 49
50 @Schema(description = "支付金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED) 50 @Schema(description = "支付金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED)
51 @NotNull(message = "支付金额，单位：分不能为空") 51 @NotNull(message = "支付金额，单位：分不能为空")
52 - private Long amount;  
53 -  
54 - @Schema(description = "支付金额，单位：分", required = true)  
55 - @NotNull(message = "支付金额，单位：分不能为空")  
56 private Long price; 52 private Long price;
57 53
58 @Schema(description = "渠道手续费，单位：百分比") 54 @Schema(description = "渠道手续费，单位：百分比")
59 private Double channelFeeRate; 55 private Double channelFeeRate;
60 56
61 @Schema(description = "渠道手续金额，单位：分") 57 @Schema(description = "渠道手续金额，单位：分")
62 - private Long channelFeeAmount; 58 + private Long channelFeePrice;
63 59
64 @Schema(description = "支付状态", requiredMode = Schema.RequiredMode.REQUIRED) 60 @Schema(description = "支付状态", requiredMode = Schema.RequiredMode.REQUIRED)
65 @NotNull(message = "支付状态不能为空") 61 @NotNull(message = "支付状态不能为空")
@@ -95,7 +91,7 @@ public class PayOrderBaseVO { @@ -95,7 +91,7 @@ public class PayOrderBaseVO {
95 91
96 @Schema(description = "退款总金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED) 92 @Schema(description = "退款总金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED)
97 @NotNull(message = "退款总金额，单位：分不能为空") 93 @NotNull(message = "退款总金额，单位：分不能为空")
98 - private Long refundAmount; 94 + private Long refundPrice;
99 95
100 @Schema(description = "渠道用户编号") 96 @Schema(description = "渠道用户编号")
101 private String channelUserId; 97 private String channelUserId;
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/order/vo/PayOrderExcelVO.java
  View file @2485a5e
@@ -35,10 +35,10 @@ public class PayOrderExcelVO { @@ -35,10 +35,10 @@ public class PayOrderExcelVO {
35 private String no; 35 private String no;
36 36
37 @ExcelProperty("支付金额,单位：元") 37 @ExcelProperty("支付金额,单位：元")
38 - private String amount; 38 + private String price;
39 39
40 @ExcelProperty("渠道手续金额，单位：元") 40 @ExcelProperty("渠道手续金额，单位：元")
41 - private String channelFeeAmount; 41 + private String channelFeePrice;
42 42
43 @ExcelProperty("渠道手续费，单位：百分比") 43 @ExcelProperty("渠道手续费，单位：百分比")
44 private String channelFeeRate; 44 private String channelFeeRate;
@@ -80,7 +80,7 @@ public class PayOrderExcelVO { @@ -80,7 +80,7 @@ public class PayOrderExcelVO {
80 private Integer refundTimes; 80 private Integer refundTimes;
81 81
82 @ExcelProperty("退款总金额，单位：元") 82 @ExcelProperty("退款总金额，单位：元")
83 - private String refundAmount; 83 + private String refundPrice;
84 84
85 @ExcelProperty("商品描述") 85 @ExcelProperty("商品描述")
86 private String body; 86 private String body;
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/order/vo/PayOrderExportReqVO.java
  View file @2485a5e
@@ -37,13 +37,13 @@ public class PayOrderExportReqVO { @@ -37,13 +37,13 @@ public class PayOrderExportReqVO {
37 private Integer notifyStatus; 37 private Integer notifyStatus;
38 38
39 @Schema(description = "支付金额，单位：分") 39 @Schema(description = "支付金额，单位：分")
40 - private Long amount; 40 + private Long price;
41 41
42 @Schema(description = "渠道手续费，单位：百分比") 42 @Schema(description = "渠道手续费，单位：百分比")
43 private Double channelFeeRate; 43 private Double channelFeeRate;
44 44
45 @Schema(description = "渠道手续金额，单位：分") 45 @Schema(description = "渠道手续金额，单位：分")
46 - private Long channelFeeAmount; 46 + private Long channelFeePrice;
47 47
48 @Schema(description = "支付状态") 48 @Schema(description = "支付状态")
49 private Integer status; 49 private Integer status;
@@ -73,7 +73,7 @@ public class PayOrderExportReqVO { @@ -73,7 +73,7 @@ public class PayOrderExportReqVO {
73 private Integer refundTimes; 73 private Integer refundTimes;
74 74
75 @Schema(description = "退款总金额，单位：分") 75 @Schema(description = "退款总金额，单位：分")
76 - private Long refundAmount; 76 + private Long refundPrice;
77 77
78 @Schema(description = "渠道用户编号") 78 @Schema(description = "渠道用户编号")
79 private String channelUserId; 79 private String channelUserId;
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/order/vo/PayOrderPageReqVO.java
  View file @2485a5e
@@ -42,13 +42,13 @@ public class PayOrderPageReqVO extends PageParam { @@ -42,13 +42,13 @@ public class PayOrderPageReqVO extends PageParam {
42 private Integer notifyStatus; 42 private Integer notifyStatus;
43 43
44 @Schema(description = "支付金额，单位：分") 44 @Schema(description = "支付金额，单位：分")
45 - private Long amount; 45 + private Long price;
46 46
47 @Schema(description = "渠道手续费，单位：百分比") 47 @Schema(description = "渠道手续费，单位：百分比")
48 private Double channelFeeRate; 48 private Double channelFeeRate;
49 49
50 @Schema(description = "渠道手续金额，单位：分") 50 @Schema(description = "渠道手续金额，单位：分")
51 - private Long channelFeeAmount; 51 + private Long channelFeePrice;
52 52
53 @Schema(description = "支付状态") 53 @Schema(description = "支付状态")
54 private Integer status; 54 private Integer status;
@@ -78,7 +78,7 @@ public class PayOrderPageReqVO extends PageParam { @@ -78,7 +78,7 @@ public class PayOrderPageReqVO extends PageParam {
78 private Integer refundTimes; 78 private Integer refundTimes;
79 79
80 @Schema(description = "退款总金额，单位：分") 80 @Schema(description = "退款总金额，单位：分")
81 - private Long refundAmount; 81 + private Long refundPrice;
82 82
83 @Schema(description = "渠道用户编号") 83 @Schema(description = "渠道用户编号")
84 private String channelUserId; 84 private String channelUserId;
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/refund/vo/PayRefundExcelVO.java
  View file @2485a5e
@@ -53,10 +53,10 @@ public class PayRefundExcelVO { @@ -53,10 +53,10 @@ public class PayRefundExcelVO {
53 private Integer type; 53 private Integer type;
54 54
55 @ExcelProperty("支付金额，单位：元") 55 @ExcelProperty("支付金额，单位：元")
56 - private String payAmount; 56 + private String payPrice;
57 57
58 @ExcelProperty("退款金额，单位：元") 58 @ExcelProperty("退款金额，单位：元")
59 - private String refundAmount; 59 + private String refundPrice;
60 60
61 @ExcelProperty("退款原因") 61 @ExcelProperty("退款原因")
62 private String reason; 62 private String reason;
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/refund/vo/PayRefundExportReqVO.java
  View file @2485a5e
@@ -46,10 +46,10 @@ public class PayRefundExportReqVO { @@ -46,10 +46,10 @@ public class PayRefundExportReqVO {
46 private Integer type; 46 private Integer type;
47 47
48 @Schema(description = "支付金额,单位分") 48 @Schema(description = "支付金额,单位分")
49 - private Long payAmount; 49 + private Long payPrice;
50 50
51 @Schema(description = "退款金额,单位分") 51 @Schema(description = "退款金额,单位分")
52 - private Long refundAmount; 52 + private Long refundPrice;
53 53
54 @Schema(description = "退款原因") 54 @Schema(description = "退款原因")
55 private String reason; 55 private String reason;
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/refund/vo/PayRefundPageReqVO.java
  View file @2485a5e
@@ -51,10 +51,10 @@ public class PayRefundPageReqVO extends PageParam { @@ -51,10 +51,10 @@ public class PayRefundPageReqVO extends PageParam {
51 private Integer type; 51 private Integer type;
52 52
53 @Schema(description = "支付金额,单位分") 53 @Schema(description = "支付金额,单位分")
54 - private Long payAmount; 54 + private Long payPrice;
55 55
56 @Schema(description = "退款金额,单位分") 56 @Schema(description = "退款金额,单位分")
57 - private Long refundAmount; 57 + private Long refundPrice;
58 58
59 @Schema(description = "退款原因") 59 @Schema(description = "退款原因")
60 private String reason; 60 private String reason;
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/convert/order/PayOrderConvert.java
  View file @2485a5e
@@ -27,7 +27,6 @@ public interface PayOrderConvert { @@ -27,7 +27,6 @@ public interface PayOrderConvert {
27 27
28 PayOrderConvert INSTANCE = Mappers.getMapper(PayOrderConvert.class); 28 PayOrderConvert INSTANCE = Mappers.getMapper(PayOrderConvert.class);
29 29
30 - @Mapping(source = "amount", target = "price")  
31 PayOrderRespVO convert(PayOrderDO bean); 30 PayOrderRespVO convert(PayOrderDO bean);
32 31
33 PayOrderRespDTO convert2(PayOrderDO order); 32 PayOrderRespDTO convert2(PayOrderDO order);
@@ -40,8 +39,6 @@ public interface PayOrderConvert { @@ -40,8 +39,6 @@ public interface PayOrderConvert {
40 39
41 PageResult<PayOrderRespVO> convertPage(PageResult<PayOrderDO> page); 40 PageResult<PayOrderRespVO> convertPage(PageResult<PayOrderDO> page);
42 41
43 - List<PayOrderExcelVO> convertList02(List<PayOrderDO> list);  
44 -  
45 /** 42 /**
46 * 订单 DO 转自定义分页对象 43 * 订单 DO 转自定义分页对象
47 * 44 *
@@ -76,14 +73,14 @@ public interface PayOrderConvert { @@ -76,14 +73,14 @@ public interface PayOrderConvert {
76 73
77 BigDecimal multiple = new BigDecimal(100); 74 BigDecimal multiple = new BigDecimal(100);
78 75
79 - payOrderExcelVO.setAmount(BigDecimal.valueOf(bean.getAmount()) 76 + payOrderExcelVO.setPrice(BigDecimal.valueOf(bean.getPrice())
80 .divide(multiple, 2, RoundingMode.HALF_UP).toString()); 77 .divide(multiple, 2, RoundingMode.HALF_UP).toString());
81 78
82 - payOrderExcelVO.setChannelFeeAmount(BigDecimal.valueOf(bean.getChannelFeeAmount()) 79 + payOrderExcelVO.setChannelFeePrice(BigDecimal.valueOf(bean.getChannelFeePrice())
83 .divide(multiple, 2, RoundingMode.HALF_UP).toString()); 80 .divide(multiple, 2, RoundingMode.HALF_UP).toString());
84 payOrderExcelVO.setChannelFeeRate(java.math.BigDecimal.valueOf(bean.getChannelFeeRate()) 81 payOrderExcelVO.setChannelFeeRate(java.math.BigDecimal.valueOf(bean.getChannelFeeRate())
85 .multiply(multiple).toString()); 82 .multiply(multiple).toString());
86 - payOrderExcelVO.setRefundAmount(BigDecimal.valueOf(bean.getRefundAmount()) 83 + payOrderExcelVO.setRefundPrice(BigDecimal.valueOf(bean.getRefundPrice())
87 .divide(multiple, 2, RoundingMode.HALF_UP).toString()); 84 .divide(multiple, 2, RoundingMode.HALF_UP).toString());
88 85
89 return payOrderExcelVO; 86 return payOrderExcelVO;
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/convert/refund/PayRefundConvert.java
  View file @2485a5e
@@ -77,9 +77,9 @@ public interface PayRefundConvert { @@ -77,9 +77,9 @@ public interface PayRefundConvert {
77 payRefundExcelVO.setCreateTime(bean.getCreateTime()); 77 payRefundExcelVO.setCreateTime(bean.getCreateTime());
78 78
79 BigDecimal multiple = new BigDecimal(100); 79 BigDecimal multiple = new BigDecimal(100);
80 - payRefundExcelVO.setPayAmount(BigDecimal.valueOf(bean.getPayAmount()) 80 + payRefundExcelVO.setPayPrice(BigDecimal.valueOf(bean.getPayPrice())
81 .divide(multiple, 2, RoundingMode.HALF_UP).toString()); 81 .divide(multiple, 2, RoundingMode.HALF_UP).toString());
82 - payRefundExcelVO.setRefundAmount(BigDecimal.valueOf(bean.getRefundAmount()) 82 + payRefundExcelVO.setRefundPrice(BigDecimal.valueOf(bean.getRefundPrice())
83 .divide(multiple, 2, RoundingMode.HALF_UP).toString()); 83 .divide(multiple, 2, RoundingMode.HALF_UP).toString());
84 84
85 return payRefundExcelVO; 85 return payRefundExcelVO;
@@ -87,7 +87,7 @@ public interface PayRefundConvert { @@ -87,7 +87,7 @@ public interface PayRefundConvert {
87 87
88 //TODO 太多需要处理了， 暂时不用 88 //TODO 太多需要处理了， 暂时不用
89 @Mappings(value = { 89 @Mappings(value = {
90 - @Mapping(source = "amount", target = "payAmount"), 90 + @Mapping(source = "price", target = "payPrice"),
91 @Mapping(source = "id", target = "orderId"), 91 @Mapping(source = "id", target = "orderId"),
92 @Mapping(target = "status",ignore = true) 92 @Mapping(target = "status",ignore = true)
93 }) 93 })
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/dataobject/demo/PayDemoOrderDO.java
  View file @2485a5e
@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableName; @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
7 import lombok.*; 7 import lombok.*;
8 8
9 import java.time.LocalDateTime; 9 import java.time.LocalDateTime;
10 -import java.util.Date;  
11 10
12 /** 11 /**
13 * 示例订单 12 * 示例订单
@@ -53,7 +52,7 @@ public class PayDemoOrderDO extends BaseDO { @@ -53,7 +52,7 @@ public class PayDemoOrderDO extends BaseDO {
53 /** 52 /**
54 * 是否支付 53 * 是否支付
55 */ 54 */
56 - private Boolean payed; 55 + private Boolean payStatus;
57 /** 56 /**
58 * 支付订单编号 57 * 支付订单编号
59 * 58 *
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/dataobject/member/MemberWalletTransactionDO.java
  View file @2485a5e
@@ -67,7 +67,7 @@ public class MemberWalletTransactionDO extends BaseDO { @@ -67,7 +67,7 @@ public class MemberWalletTransactionDO extends BaseDO {
67 /** 67 /**
68 * 交易金额, 单位分 68 * 交易金额, 单位分
69 */ 69 */
70 - private Integer amount; 70 + private Integer price;
71 71
72 /** 72 /**
73 * 余额, 单位分 73 * 余额, 单位分
@@ -83,4 +83,4 @@ public class MemberWalletTransactionDO extends BaseDO { @@ -83,4 +83,4 @@ public class MemberWalletTransactionDO extends BaseDO {
83 * 交易时间 83 * 交易时间
84 */ 84 */
85 private LocalDateTime transactionTime; 85 private LocalDateTime transactionTime;
86 -}  
87 \ No newline at end of file 86 \ No newline at end of file
  87 +}
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/dataobject/order/PayOrderDO.java
  View file @2485a5e
@@ -76,17 +76,13 @@ public class PayOrderDO extends BaseDO { @@ -76,17 +76,13 @@ public class PayOrderDO extends BaseDO {
76 * 枚举 {@link PayOrderNotifyStatusEnum} 76 * 枚举 {@link PayOrderNotifyStatusEnum}
77 */ 77 */
78 private Integer notifyStatus; 78 private Integer notifyStatus;
79 -// /**  
80 -// * 商户拓展参数  
81 -// */  
82 -// private Map<String, String> merchantExtras;  
83 79
84 // ========== 订单相关字段 ========== 80 // ========== 订单相关字段 ==========
85 81
86 /** 82 /**
87 * 支付金额，单位：分 83 * 支付金额，单位：分
88 */ 84 */
89 - private Integer amount; 85 + private Integer price;
90 /** 86 /**
91 * 渠道手续费，单位：百分比 87 * 渠道手续费，单位：百分比
92 * 88 *
@@ -96,7 +92,7 @@ public class PayOrderDO extends BaseDO { @@ -96,7 +92,7 @@ public class PayOrderDO extends BaseDO {
96 /** 92 /**
97 * 渠道手续金额，单位：分 93 * 渠道手续金额，单位：分
98 */ 94 */
99 - private Long channelFeeAmount; 95 + private Long channelFeePrice;
100 /** 96 /**
101 * 支付状态 97 * 支付状态
102 * 98 *
@@ -140,7 +136,7 @@ public class PayOrderDO extends BaseDO { @@ -140,7 +136,7 @@ public class PayOrderDO extends BaseDO {
140 /** 136 /**
141 * 退款总金额，单位：分 137 * 退款总金额，单位：分
142 */ 138 */
143 - private Long refundAmount; 139 + private Long refundPrice;
144 140
145 // ========== 渠道相关字段 ========== 141 // ========== 渠道相关字段 ==========
146 /** 142 /**
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/dataobject/refund/PayRefundDO.java
  View file @2485a5e
@@ -124,11 +124,11 @@ public class PayRefundDO extends BaseDO { @@ -124,11 +124,11 @@ public class PayRefundDO extends BaseDO {
124 /** 124 /**
125 * 支付金额，单位：分 125 * 支付金额，单位：分
126 */ 126 */
127 - private Integer payAmount; 127 + private Integer payPrice;
128 /** 128 /**
129 * 退款金额，单位：分 129 * 退款金额，单位：分
130 */ 130 */
131 - private Integer refundAmount; 131 + private Integer refundPrice;
132 132
133 /** 133 /**
134 * 退款原因 134 * 退款原因
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/demo/PayDemoOrderMapper.java
  View file @2485a5e
@@ -22,7 +22,7 @@ public interface PayDemoOrderMapper extends BaseMapperX&lt;PayDemoOrderDO&gt; { @@ -22,7 +22,7 @@ public interface PayDemoOrderMapper extends BaseMapperX&lt;PayDemoOrderDO&gt; {
22 22
23 default int updateByIdAndPayed(Long id, boolean wherePayed, PayDemoOrderDO updateObj) { 23 default int updateByIdAndPayed(Long id, boolean wherePayed, PayDemoOrderDO updateObj) {
24 return update(updateObj, new LambdaQueryWrapperX<PayDemoOrderDO>() 24 return update(updateObj, new LambdaQueryWrapperX<PayDemoOrderDO>()
25 - .eq(PayDemoOrderDO::getId, id).eq(PayDemoOrderDO::getPayed, wherePayed)); 25 + .eq(PayDemoOrderDO::getId, id).eq(PayDemoOrderDO::getPayStatus, wherePayed));
26 } 26 }
27 27
28 } 28 }
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/demo/PayDemoOrderServiceImpl.java
  View file @2485a5e
1 package cn.iocoder.yudao.module.pay.service.demo; 1 package cn.iocoder.yudao.module.pay.service.demo;
2 2
3 import cn.hutool.core.lang.Assert; 3 import cn.hutool.core.lang.Assert;
4 -import cn.hutool.core.util.ObjectUtil;  
5 import cn.iocoder.yudao.framework.common.pojo.PageParam; 4 import cn.iocoder.yudao.framework.common.pojo.PageParam;
6 import cn.iocoder.yudao.framework.common.pojo.PageResult; 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
7 -import cn.iocoder.yudao.framework.common.util.json.JsonUtils;  
8 import cn.iocoder.yudao.module.pay.api.order.PayOrderApi; 6 import cn.iocoder.yudao.module.pay.api.order.PayOrderApi;
9 import cn.iocoder.yudao.module.pay.api.order.dto.PayOrderCreateReqDTO; 7 import cn.iocoder.yudao.module.pay.api.order.dto.PayOrderCreateReqDTO;
10 import cn.iocoder.yudao.module.pay.api.order.dto.PayOrderRespDTO; 8 import cn.iocoder.yudao.module.pay.api.order.dto.PayOrderRespDTO;
@@ -85,14 +83,14 @@ public class PayDemoOrderServiceImpl implements PayDemoOrderService { @@ -85,14 +83,14 @@ public class PayDemoOrderServiceImpl implements PayDemoOrderService {
85 // 1.2 插入 demo 订单 83 // 1.2 插入 demo 订单
86 PayDemoOrderDO demoOrder = new PayDemoOrderDO().setUserId(userId) 84 PayDemoOrderDO demoOrder = new PayDemoOrderDO().setUserId(userId)
87 .setSpuId(createReqVO.getSpuId()).setSpuName(spuName) 85 .setSpuId(createReqVO.getSpuId()).setSpuName(spuName)
88 - .setPrice(price).setPayed(false).setRefundPrice(0); 86 + .setPrice(price).setPayStatus(false).setRefundPrice(0);
89 payDemoOrderMapper.insert(demoOrder); 87 payDemoOrderMapper.insert(demoOrder);
90 88
91 // 2.1 创建支付单 89 // 2.1 创建支付单
92 Long payOrderId = payOrderApi.createOrder(new PayOrderCreateReqDTO() 90 Long payOrderId = payOrderApi.createOrder(new PayOrderCreateReqDTO()
93 .setAppId(PAY_APP_ID).setUserIp(getClientIP()) // 支付应用 91 .setAppId(PAY_APP_ID).setUserIp(getClientIP()) // 支付应用
94 .setMerchantOrderId(demoOrder.getId().toString()) // 业务的订单编号 92 .setMerchantOrderId(demoOrder.getId().toString()) // 业务的订单编号
95 - .setSubject(spuName).setBody("").setAmount(price) // 价格信息 93 + .setSubject(spuName).setBody("").setPrice(price) // 价格信息
96 .setExpireTime(addTime(Duration.ofHours(2L)))); // 支付的过期时间 94 .setExpireTime(addTime(Duration.ofHours(2L)))); // 支付的过期时间
97 // 2.2 更新支付单到 demo 订单 95 // 2.2 更新支付单到 demo 订单
98 payDemoOrderMapper.updateById(new PayDemoOrderDO().setId(demoOrder.getId()) 96 payDemoOrderMapper.updateById(new PayDemoOrderDO().setId(demoOrder.getId())
@@ -101,12 +99,6 @@ public class PayDemoOrderServiceImpl implements PayDemoOrderService { @@ -101,12 +99,6 @@ public class PayDemoOrderServiceImpl implements PayDemoOrderService {
101 return demoOrder.getId(); 99 return demoOrder.getId();
102 } 100 }
103 101
104 -// private void validateDemoOrderExists(Long id) {  
105 -// if (demoOrderMapper.selectById(id) == null) {  
106 -// throw exception(DEMO_ORDER_NOT_EXISTS);  
107 -// }  
108 -// }  
109 -  
110 @Override 102 @Override
111 public PayDemoOrderDO getDemoOrder(Long id) { 103 public PayDemoOrderDO getDemoOrder(Long id) {
112 return payDemoOrderMapper.selectById(id); 104 return payDemoOrderMapper.selectById(id);
@@ -124,7 +116,7 @@ public class PayDemoOrderServiceImpl implements PayDemoOrderService { @@ -124,7 +116,7 @@ public class PayDemoOrderServiceImpl implements PayDemoOrderService {
124 116
125 // 更新 PayDemoOrderDO 状态为已支付 117 // 更新 PayDemoOrderDO 状态为已支付
126 int updateCount = payDemoOrderMapper.updateByIdAndPayed(id, false, 118 int updateCount = payDemoOrderMapper.updateByIdAndPayed(id, false,
127 - new PayDemoOrderDO().setPayed(true).setPayTime(LocalDateTime.now()) 119 + new PayDemoOrderDO().setPayStatus(true).setPayTime(LocalDateTime.now())
128 .setPayChannelCode(payOrder.getChannelCode())); 120 .setPayChannelCode(payOrder.getChannelCode()));
129 if (updateCount == 0) { 121 if (updateCount == 0) {
130 throw exception(PAY_DEMO_ORDER_UPDATE_PAID_STATUS_NOT_UNPAID); 122 throw exception(PAY_DEMO_ORDER_UPDATE_PAID_STATUS_NOT_UNPAID);
@@ -148,7 +140,7 @@ public class PayDemoOrderServiceImpl implements PayDemoOrderService { @@ -148,7 +140,7 @@ public class PayDemoOrderServiceImpl implements PayDemoOrderService {
148 throw exception(PAY_DEMO_ORDER_NOT_FOUND); 140 throw exception(PAY_DEMO_ORDER_NOT_FOUND);
149 } 141 }
150 // 1.2 校验订单未支付 142 // 1.2 校验订单未支付
151 - if (order.getPayed()) { 143 + if (order.getPayStatus()) {
152 log.error("[validateDemoOrderCanPaid][order({}) 不处于待支付状态，请进行处理！order 数据是：{}]", 144 log.error("[validateDemoOrderCanPaid][order({}) 不处于待支付状态，请进行处理！order 数据是：{}]",
153 id, toJsonString(order)); 145 id, toJsonString(order));
154 throw exception(PAY_DEMO_ORDER_UPDATE_PAID_STATUS_NOT_UNPAID); 146 throw exception(PAY_DEMO_ORDER_UPDATE_PAID_STATUS_NOT_UNPAID);
@@ -173,7 +165,7 @@ public class PayDemoOrderServiceImpl implements PayDemoOrderService { @@ -173,7 +165,7 @@ public class PayDemoOrderServiceImpl implements PayDemoOrderService {
173 throw exception(PAY_DEMO_ORDER_UPDATE_PAID_FAIL_PAY_ORDER_STATUS_NOT_SUCCESS); 165 throw exception(PAY_DEMO_ORDER_UPDATE_PAID_FAIL_PAY_ORDER_STATUS_NOT_SUCCESS);
174 } 166 }
175 // 2.3 校验支付金额一致 167 // 2.3 校验支付金额一致
176 - if (notEqual(payOrder.getAmount(), order.getPrice())) { 168 + if (notEqual(payOrder.getPrice(), order.getPrice())) {
177 log.error("[validateDemoOrderCanPaid][order({}) payOrder({}) 支付金额不匹配，请进行处理！order 数据是：{}，payOrder 数据是：{}]", 169 log.error("[validateDemoOrderCanPaid][order({}) payOrder({}) 支付金额不匹配，请进行处理！order 数据是：{}，payOrder 数据是：{}]",
178 id, payOrderId, toJsonString(order), toJsonString(payOrder)); 170 id, payOrderId, toJsonString(order), toJsonString(payOrder));
179 throw exception(PAY_DEMO_ORDER_UPDATE_PAID_FAIL_PAY_PRICE_NOT_MATCH); 171 throw exception(PAY_DEMO_ORDER_UPDATE_PAID_FAIL_PAY_PRICE_NOT_MATCH);
@@ -196,7 +188,7 @@ public class PayDemoOrderServiceImpl implements PayDemoOrderService { @@ -196,7 +188,7 @@ public class PayDemoOrderServiceImpl implements PayDemoOrderService {
196 Long payRefundId = payRefundApi.createPayRefund(new PayRefundCreateReqDTO() 188 Long payRefundId = payRefundApi.createPayRefund(new PayRefundCreateReqDTO()
197 .setAppId(PAY_APP_ID).setUserIp(getClientIP()) // 支付应用 189 .setAppId(PAY_APP_ID).setUserIp(getClientIP()) // 支付应用
198 .setPayOrderId(order.getPayOrderId()) // 支付单号 190 .setPayOrderId(order.getPayOrderId()) // 支付单号
199 - .setReason("想退钱").setAmount(order.getPrice()));// 价格信息 191 + .setReason("想退钱").setPrice(order.getPrice()));// 价格信息
200 // 2.2 更新退款单到 demo 订单 192 // 2.2 更新退款单到 demo 订单
201 payDemoOrderMapper.updateById(new PayDemoOrderDO().setId(id) 193 payDemoOrderMapper.updateById(new PayDemoOrderDO().setId(id)
202 .setPayRefundId(payRefundId).setRefundPrice(order.getPrice())); 194 .setPayRefundId(payRefundId).setRefundPrice(order.getPrice()));
@@ -209,7 +201,7 @@ public class PayDemoOrderServiceImpl implements PayDemoOrderService { @@ -209,7 +201,7 @@ public class PayDemoOrderServiceImpl implements PayDemoOrderService {
209 throw exception(PAY_DEMO_ORDER_NOT_FOUND); 201 throw exception(PAY_DEMO_ORDER_NOT_FOUND);
210 } 202 }
211 // 校验订单是否支付 203 // 校验订单是否支付
212 - if (!order.getPayed()) { 204 + if (!order.getPayStatus()) {
213 throw exception(PAY_DEMO_ORDER_REFUND_FAIL_NOT_PAID); 205 throw exception(PAY_DEMO_ORDER_REFUND_FAIL_NOT_PAID);
214 } 206 }
215 // 校验订单是否已退款 207 // 校验订单是否已退款
@@ -251,7 +243,7 @@ public class PayDemoOrderServiceImpl implements PayDemoOrderService { @@ -251,7 +243,7 @@ public class PayDemoOrderServiceImpl implements PayDemoOrderService {
251 throw exception(PAY_DEMO_ORDER_REFUND_FAIL_REFUND_NOT_SUCCESS); 243 throw exception(PAY_DEMO_ORDER_REFUND_FAIL_REFUND_NOT_SUCCESS);
252 } 244 }
253 // 2.3 校验退款金额一致 245 // 2.3 校验退款金额一致
254 - if (notEqual(payRefund.getRefundAmount(), order.getPrice())) { 246 + if (notEqual(payRefund.getRefundPrice(), order.getPrice())) {
255 log.error("[validateDemoOrderCanRefunded][order({}) payRefund({}) 退款金额不匹配，请进行处理！order 数据是：{}，payRefund 数据是：{}]", 247 log.error("[validateDemoOrderCanRefunded][order({}) payRefund({}) 退款金额不匹配，请进行处理！order 数据是：{}，payRefund 数据是：{}]",
256 id, payRefundId, toJsonString(order), toJsonString(payRefund)); 248 id, payRefundId, toJsonString(order), toJsonString(payRefund));
257 throw exception(PAY_DEMO_ORDER_REFUND_FAIL_REFUND_PRICE_NOT_MATCH); 249 throw exception(PAY_DEMO_ORDER_REFUND_FAIL_REFUND_PRICE_NOT_MATCH);
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.java
  View file @2485a5e
@@ -118,7 +118,7 @@ public class PayOrderServiceImpl implements PayOrderService { @@ -118,7 +118,7 @@ public class PayOrderServiceImpl implements PayOrderService {
118 // 退款相关字段 118 // 退款相关字段
119 // todo @芋艿 创建支付的订单的退款状态枚举是不是有问题，应该是 PayRefundTypeEnum 吧 您这填写的是 PayOrderNotifyStatusEnum 回调状态枚举 119 // todo @芋艿 创建支付的订单的退款状态枚举是不是有问题，应该是 PayRefundTypeEnum 吧 您这填写的是 PayOrderNotifyStatusEnum 回调状态枚举
120 order.setRefundStatus(PayOrderNotifyStatusEnum.NO.getStatus()) 120 order.setRefundStatus(PayOrderNotifyStatusEnum.NO.getStatus())
121 - .setRefundTimes(0).setRefundAmount(0L); 121 + .setRefundTimes(0).setRefundPrice(0L);
122 orderMapper.insert(order); 122 orderMapper.insert(order);
123 // 最终返回 123 // 最终返回
124 return order.getId(); 124 return order.getId();
@@ -147,7 +147,7 @@ public class PayOrderServiceImpl implements PayOrderService { @@ -147,7 +147,7 @@ public class PayOrderServiceImpl implements PayOrderService {
147 .setNotifyUrl(genChannelPayNotifyUrl(channel)) 147 .setNotifyUrl(genChannelPayNotifyUrl(channel))
148 .setReturnUrl(reqVO.getReturnUrl()) 148 .setReturnUrl(reqVO.getReturnUrl())
149 // 订单相关字段 149 // 订单相关字段
150 - .setAmount(order.getAmount()).setExpireTime(order.getExpireTime()); 150 + .setAmount(order.getPrice()).setExpireTime(order.getExpireTime());
151 PayOrderUnifiedRespDTO unifiedOrderRespDTO = client.unifiedOrder(unifiedOrderReqDTO); 151 PayOrderUnifiedRespDTO unifiedOrderRespDTO = client.unifiedOrder(unifiedOrderReqDTO);
152 152
153 // TODO 轮询三方接口，是否已经支付的任务 153 // TODO 轮询三方接口，是否已经支付的任务
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/refund/PayRefundServiceImpl.java
  View file @2485a5e
@@ -117,7 +117,7 @@ public class PayRefundServiceImpl implements PayRefundService { @@ -117,7 +117,7 @@ public class PayRefundServiceImpl implements PayRefundService {
117 validatePayRefund(reqDTO, order); 117 validatePayRefund(reqDTO, order);
118 // 退款类型 118 // 退款类型
119 PayRefundTypeEnum refundType = PayRefundTypeEnum.SOME; 119 PayRefundTypeEnum refundType = PayRefundTypeEnum.SOME;
120 - if (Objects.equals(reqDTO.getAmount(), order.getAmount())) { 120 + if (Objects.equals(reqDTO.getPrice(), order.getPrice())) {
121 refundType = PayRefundTypeEnum.ALL; 121 refundType = PayRefundTypeEnum.ALL;
122 } 122 }
123 PayOrderExtensionDO orderExtensionDO = orderExtensionService.getOrderExtension(order.getSuccessExtensionId()); 123 PayOrderExtensionDO orderExtensionDO = orderExtensionService.getOrderExtension(order.getSuccessExtensionId());
@@ -144,8 +144,8 @@ public class PayRefundServiceImpl implements PayRefundService { @@ -144,8 +144,8 @@ public class PayRefundServiceImpl implements PayRefundService {
144 .orderId(order.getId()) 144 .orderId(order.getId())
145 .merchantRefundNo(merchantRefundId) // TODO 芋艿：需要优化 145 .merchantRefundNo(merchantRefundId) // TODO 芋艿：需要优化
146 .notifyUrl(app.getRefundNotifyUrl()) 146 .notifyUrl(app.getRefundNotifyUrl())
147 - .payAmount(order.getAmount())  
148 - .refundAmount(reqDTO.getAmount()) 147 + .payPrice(order.getPrice())
  148 + .refundPrice(reqDTO.getPrice())
149 .userIp(reqDTO.getUserIp()) 149 .userIp(reqDTO.getUserIp())
150 .merchantOrderId(order.getMerchantOrderId()) 150 .merchantOrderId(order.getMerchantOrderId())
151 .tradeNo(orderExtensionDO.getNo()) 151 .tradeNo(orderExtensionDO.getNo())
@@ -159,7 +159,7 @@ public class PayRefundServiceImpl implements PayRefundService { @@ -159,7 +159,7 @@ public class PayRefundServiceImpl implements PayRefundService {
159 // TODO @jason：搞到 convert 里。一些额外的自动，手动 set 下； 159 // TODO @jason：搞到 convert 里。一些额外的自动，手动 set 下；
160 PayRefundUnifiedReqDTO unifiedReqDTO = new PayRefundUnifiedReqDTO(); 160 PayRefundUnifiedReqDTO unifiedReqDTO = new PayRefundUnifiedReqDTO();
161 unifiedReqDTO.setUserIp(reqDTO.getUserIp()) 161 unifiedReqDTO.setUserIp(reqDTO.getUserIp())
162 - .setAmount(reqDTO.getAmount()) 162 + .setAmount(reqDTO.getPrice())
163 .setChannelOrderNo(order.getChannelOrderNo()) 163 .setChannelOrderNo(order.getChannelOrderNo())
164 .setPayTradeNo(orderExtensionDO.getNo()) 164 .setPayTradeNo(orderExtensionDO.getNo())
165 .setMerchantRefundId(merchantRefundId) // TODO 芋艿：需要优化 165 .setMerchantRefundId(merchantRefundId) // TODO 芋艿：需要优化
@@ -209,17 +209,17 @@ public class PayRefundServiceImpl implements PayRefundService { @@ -209,17 +209,17 @@ public class PayRefundServiceImpl implements PayRefundService {
209 209
210 // 得到已退金额 210 // 得到已退金额
211 PayOrderDO payOrderDO = orderService.getOrder(refundDO.getOrderId()); 211 PayOrderDO payOrderDO = orderService.getOrder(refundDO.getOrderId());
212 - Long refundedAmount = payOrderDO.getRefundAmount(); 212 + Long refundedAmount = payOrderDO.getRefundPrice();
213 213
214 PayOrderStatusEnum orderStatus = PayOrderStatusEnum.SUCCESS; 214 PayOrderStatusEnum orderStatus = PayOrderStatusEnum.SUCCESS;
215 - if(Objects.equals(payOrderDO.getAmount(), refundedAmount+ refundDO.getRefundAmount())){ 215 + if(Objects.equals(payOrderDO.getPrice(), refundedAmount+ refundDO.getRefundPrice())){
216 //支付金额 = 已退金额 + 本次退款金额。 216 //支付金额 = 已退金额 + 本次退款金额。
217 orderStatus = PayOrderStatusEnum.CLOSED; 217 orderStatus = PayOrderStatusEnum.CLOSED;
218 } 218 }
219 // 更新支付订单 219 // 更新支付订单
220 PayOrderDO updateOrderDO = new PayOrderDO(); 220 PayOrderDO updateOrderDO = new PayOrderDO();
221 updateOrderDO.setId(refundDO.getOrderId()) 221 updateOrderDO.setId(refundDO.getOrderId())
222 - .setRefundAmount(refundedAmount + refundDO.getRefundAmount()) 222 + .setRefundPrice(refundedAmount + refundDO.getRefundPrice())
223 .setStatus(orderStatus.getStatus()) 223 .setStatus(orderStatus.getStatus())
224 .setRefundTimes(payOrderDO.getRefundTimes() + 1) 224 .setRefundTimes(payOrderDO.getRefundTimes() + 1)
225 .setRefundStatus(refundDO.getType()); 225 .setRefundStatus(refundDO.getType());
@@ -257,8 +257,8 @@ public class PayRefundServiceImpl implements PayRefundService { @@ -257,8 +257,8 @@ public class PayRefundServiceImpl implements PayRefundService {
257 throw ServiceExceptionUtil.exception(ErrorCodeConstants.PAY_REFUND_ALL_REFUNDED); 257 throw ServiceExceptionUtil.exception(ErrorCodeConstants.PAY_REFUND_ALL_REFUNDED);
258 } 258 }
259 // 校验金额 退款金额不能大于 原定的金额 259 // 校验金额 退款金额不能大于 原定的金额
260 - if (reqDTO.getAmount() + order.getRefundAmount() > order.getAmount()){  
261 - throw ServiceExceptionUtil.exception(ErrorCodeConstants.PAY_REFUND_AMOUNT_EXCEED); 260 + if (reqDTO.getPrice() + order.getRefundPrice() > order.getPrice()){
  261 + throw ServiceExceptionUtil.exception(ErrorCodeConstants.PAY_PRICE_PRICE_EXCEED);
262 } 262 }
263 // 校验渠道订单号 263 // 校验渠道订单号
264 if (StrUtil.isEmpty(order.getChannelOrderNo())) { 264 if (StrUtil.isEmpty(order.getChannelOrderNo())) {
yudao-module-pay/yudao-module-pay-biz/src/test-integration/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceIntegrationTest.java
  View file @2485a5e
@@ -30,7 +30,7 @@ public class PayOrderServiceIntegrationTest extends BaseDbIntegrationTest { @@ -30,7 +30,7 @@ public class PayOrderServiceIntegrationTest extends BaseDbIntegrationTest {
30 reqDTO.setMerchantOrderId(String.valueOf(System.currentTimeMillis())); 30 reqDTO.setMerchantOrderId(String.valueOf(System.currentTimeMillis()));
31 reqDTO.setSubject("标题"); 31 reqDTO.setSubject("标题");
32 reqDTO.setBody("内容"); 32 reqDTO.setBody("内容");
33 - reqDTO.setAmount(100); 33 + reqDTO.setPrice(100);
34 reqDTO.setExpireTime(DateUtils.addTime(Duration.ofDays(1))); 34 reqDTO.setExpireTime(DateUtils.addTime(Duration.ofDays(1)));
35 // 发起请求 35 // 发起请求
36 payOrderService.createPayOrder(reqDTO); 36 payOrderService.createPayOrder(reqDTO);
yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceTest.java
  View file @2485a5e
@@ -75,9 +75,9 @@ public class PayOrderServiceTest extends BaseDbUnitTest { @@ -75,9 +75,9 @@ public class PayOrderServiceTest extends BaseDbUnitTest {
75 o.setBody("斌斌子送给灿灿子的炸弹猫"); 75 o.setBody("斌斌子送给灿灿子的炸弹猫");
76 o.setNotifyUrl("https://hc.com/lbh"); 76 o.setNotifyUrl("https://hc.com/lbh");
77 o.setNotifyStatus(PayOrderNotifyStatusEnum.SUCCESS.getStatus()); 77 o.setNotifyStatus(PayOrderNotifyStatusEnum.SUCCESS.getStatus());
78 - o.setAmount(10000); 78 + o.setPrice(10000);
79 o.setChannelFeeRate(0.01); 79 o.setChannelFeeRate(0.01);
80 - o.setChannelFeeAmount(1L); 80 + o.setChannelFeePrice(1L);
81 o.setStatus(PayOrderStatusEnum.SUCCESS.getStatus()); 81 o.setStatus(PayOrderStatusEnum.SUCCESS.getStatus());
82 o.setUserIp("127.0.0.1"); 82 o.setUserIp("127.0.0.1");
83 o.setCreateTime(LocalDateTime.of(2018, 1, 1, 10, 1, 0)); 83 o.setCreateTime(LocalDateTime.of(2018, 1, 1, 10, 1, 0));
@@ -87,7 +87,7 @@ public class PayOrderServiceTest extends BaseDbUnitTest { @@ -87,7 +87,7 @@ public class PayOrderServiceTest extends BaseDbUnitTest {
87 o.setSuccessExtensionId(1L); 87 o.setSuccessExtensionId(1L);
88 o.setRefundStatus(PayRefundTypeEnum.NO.getStatus()); 88 o.setRefundStatus(PayRefundTypeEnum.NO.getStatus());
89 o.setRefundTimes(0); 89 o.setRefundTimes(0);
90 - o.setRefundAmount(0L); 90 + o.setRefundPrice(0L);
91 o.setChannelUserId("1008611"); 91 o.setChannelUserId("1008611");
92 o.setChannelOrderNo(channelOrderId); 92 o.setChannelOrderNo(channelOrderId);
93 o.setUpdateTime(LocalDateTime.of(2018, 1, 1, 10, 10, 15)); 93 o.setUpdateTime(LocalDateTime.of(2018, 1, 1, 10, 10, 15));
@@ -143,9 +143,9 @@ public class PayOrderServiceTest extends BaseDbUnitTest { @@ -143,9 +143,9 @@ public class PayOrderServiceTest extends BaseDbUnitTest {
143 o.setBody("斌斌子送给灿灿子的炸弹猫"); 143 o.setBody("斌斌子送给灿灿子的炸弹猫");
144 o.setNotifyUrl("https://hc.com/lbh"); 144 o.setNotifyUrl("https://hc.com/lbh");
145 o.setNotifyStatus(PayOrderNotifyStatusEnum.SUCCESS.getStatus()); 145 o.setNotifyStatus(PayOrderNotifyStatusEnum.SUCCESS.getStatus());
146 - o.setAmount(10000); 146 + o.setPrice(10000);
147 o.setChannelFeeRate(0.01); 147 o.setChannelFeeRate(0.01);
148 - o.setChannelFeeAmount(1L); 148 + o.setChannelFeePrice(1L);
149 o.setStatus(PayOrderStatusEnum.SUCCESS.getStatus()); 149 o.setStatus(PayOrderStatusEnum.SUCCESS.getStatus());
150 o.setUserIp("127.0.0.1"); 150 o.setUserIp("127.0.0.1");
151 o.setCreateTime(LocalDateTime.of(2018, 1, 1, 10, 1, 0)); 151 o.setCreateTime(LocalDateTime.of(2018, 1, 1, 10, 1, 0));
@@ -155,7 +155,7 @@ public class PayOrderServiceTest extends BaseDbUnitTest { @@ -155,7 +155,7 @@ public class PayOrderServiceTest extends BaseDbUnitTest {
155 o.setSuccessExtensionId(1L); 155 o.setSuccessExtensionId(1L);
156 o.setRefundStatus(PayRefundTypeEnum.NO.getStatus()); 156 o.setRefundStatus(PayRefundTypeEnum.NO.getStatus());
157 o.setRefundTimes(0); 157 o.setRefundTimes(0);
158 - o.setRefundAmount(0L); 158 + o.setRefundPrice(0L);
159 o.setChannelUserId("1008611"); 159 o.setChannelUserId("1008611");
160 o.setChannelOrderNo(channelOrderId); 160 o.setChannelOrderNo(channelOrderId);
161 o.setUpdateTime(LocalDateTime.of(2018, 1, 1, 10, 10, 15)); 161 o.setUpdateTime(LocalDateTime.of(2018, 1, 1, 10, 10, 15));
yudao-module-pay/yudao-module-pay-biz/src/test/java/cn/iocoder/yudao/module/pay/service/refund/PayRefundServiceTest.java
  View file @2485a5e
@@ -69,8 +69,8 @@ public class PayRefundServiceTest extends BaseDbUnitTest { @@ -69,8 +69,8 @@ public class PayRefundServiceTest extends BaseDbUnitTest {
69 o.setNotifyStatus(PayOrderNotifyStatusEnum.SUCCESS.getStatus()); 69 o.setNotifyStatus(PayOrderNotifyStatusEnum.SUCCESS.getStatus());
70 o.setStatus(PayRefundStatusEnum.SUCCESS.getStatus()); 70 o.setStatus(PayRefundStatusEnum.SUCCESS.getStatus());
71 o.setType(PayRefundTypeEnum.SOME.getStatus()); 71 o.setType(PayRefundTypeEnum.SOME.getStatus());
72 - o.setPayAmount(100);  
73 - o.setRefundAmount(500); 72 + o.setPayPrice(100);
  73 + o.setRefundPrice(500);
74 o.setReason("就是想退款了，你有意见吗"); 74 o.setReason("就是想退款了，你有意见吗");
75 o.setUserIp("127.0.0.1"); 75 o.setUserIp("127.0.0.1");
76 o.setChannelOrderNo("CH0000001"); 76 o.setChannelOrderNo("CH0000001");
@@ -134,8 +134,8 @@ public class PayRefundServiceTest extends BaseDbUnitTest { @@ -134,8 +134,8 @@ public class PayRefundServiceTest extends BaseDbUnitTest {
134 o.setNotifyStatus(PayOrderNotifyStatusEnum.SUCCESS.getStatus()); 134 o.setNotifyStatus(PayOrderNotifyStatusEnum.SUCCESS.getStatus());
135 o.setStatus(PayRefundStatusEnum.SUCCESS.getStatus()); 135 o.setStatus(PayRefundStatusEnum.SUCCESS.getStatus());
136 o.setType(PayRefundTypeEnum.SOME.getStatus()); 136 o.setType(PayRefundTypeEnum.SOME.getStatus());
137 - o.setPayAmount(100);  
138 - o.setRefundAmount(500); 137 + o.setPayPrice(100);
  138 + o.setRefundPrice(500);
139 o.setReason("就是想退款了，你有意见吗"); 139 o.setReason("就是想退款了，你有意见吗");
140 o.setUserIp("127.0.0.1"); 140 o.setUserIp("127.0.0.1");
141 o.setChannelOrderNo("CH0000001"); 141 o.setChannelOrderNo("CH0000001");
yudao-server/pom.xml
  View file @2485a5e
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
53 <!-- <artifactId>yudao-module-bpm-biz</artifactId>--> 53 <!-- <artifactId>yudao-module-bpm-biz</artifactId>-->
54 <!-- <version>${revision}</version>--> 54 <!-- <version>${revision}</version>-->
55 <!-- </dependency>--> 55 <!-- </dependency>-->
56 - <!-- 支付服务 --> 56 + <!-- 支付服务。默认注释，保证编译速度 -->
57 <dependency> 57 <dependency>
58 <groupId>cn.iocoder.boot</groupId> 58 <groupId>cn.iocoder.boot</groupId>
59 <artifactId>yudao-module-pay-biz</artifactId> 59 <artifactId>yudao-module-pay-biz</artifactId>
yudao-ui-admin/src/router/index.js
  View file @2485a5e
@@ -227,14 +227,14 @@ export const constantRoutes = [ @@ -227,14 +227,14 @@ export const constantRoutes = [
227 component: Layout, 227 component: Layout,
228 hidden: true, 228 hidden: true,
229 children: [{ 229 children: [{
230 - path: 'order/submit',  
231 - name: 'PayOrderSubmit', 230 + path: 'cashier',
  231 + name: 'PayCashier',
232 hidden: true, 232 hidden: true,
233 meta: { 233 meta: {
234 title: '收银台', 234 title: '收银台',
235 noCache: true 235 noCache: true
236 }, 236 },
237 - component: (resolve) => require(['@/views/pay/order/submit'], resolve) 237 + component: (resolve) => require(['@/views/pay/cashier'], resolve)
238 }] 238 }]
239 } 239 }
240 ] 240 ]
yudao-ui-admin/src/views/mall/trade/order/index.vue
  View file @2485a5e
@@ -113,7 +113,7 @@ @@ -113,7 +113,7 @@
113 </template> 113 </template>
114 </el-table-column> 114 </el-table-column>
115 <!-- TODO @小程：这里应该是一个订单下，多个商品，只展示订单上的总金额，就是 order.payPrice --> 115 <!-- TODO @小程：这里应该是一个订单下，多个商品，只展示订单上的总金额，就是 order.payPrice -->
116 - <el-table-column label="实付金额(元)" prop="amount" align="center" width="100"/> 116 + <el-table-column label="实付金额(元)" prop="price" align="center" width="100"/>
117 <!-- TODO @小程：这里应该是一个订单下，多个商品，只展示订单上的收件信息；使用 order.receiverXXX 开头的字段 --> 117 <!-- TODO @小程：这里应该是一个订单下，多个商品，只展示订单上的收件信息；使用 order.receiverXXX 开头的字段 -->
118 <el-table-column label="买家/收货人" prop="buyer" header-align="center" width="auto" min-width="300"> 118 <el-table-column label="买家/收货人" prop="buyer" header-align="center" width="auto" min-width="300">
119 <template v-slot="{ row }"> 119 <template v-slot="{ row }">
yudao-ui-admin/src/views/pay/order/submit.vue renamed to yudao-ui-admin/src/views/pay/cashier/index.vue
  View file @2485a5e
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <el-descriptions-item label="支付单号">{{ payOrder.id }}</el-descriptions-item> 6 <el-descriptions-item label="支付单号">{{ payOrder.id }}</el-descriptions-item>
7 <el-descriptions-item label="商品标题">{{ payOrder.subject }}</el-descriptions-item> 7 <el-descriptions-item label="商品标题">{{ payOrder.subject }}</el-descriptions-item>
8 <el-descriptions-item label="商品内容">{{ payOrder.body }}</el-descriptions-item> 8 <el-descriptions-item label="商品内容">{{ payOrder.body }}</el-descriptions-item>
9 - <el-descriptions-item label="支付金额">￥{{ (payOrder.amount / 100.0).toFixed(2) }}</el-descriptions-item> 9 + <el-descriptions-item label="支付金额">￥{{ (payOrder.price / 100.0).toFixed(2) }}</el-descriptions-item>
10 <el-descriptions-item label="创建时间">{{ parseTime(payOrder.createTime) }}</el-descriptions-item> 10 <el-descriptions-item label="创建时间">{{ parseTime(payOrder.createTime) }}</el-descriptions-item>
11 <el-descriptions-item label="过期时间">{{ parseTime(payOrder.expireTime) }}</el-descriptions-item> 11 <el-descriptions-item label="过期时间">{{ parseTime(payOrder.expireTime) }}</el-descriptions-item>
12 </el-descriptions> 12 </el-descriptions>
@@ -88,16 +88,17 @@ @@ -88,16 +88,17 @@
88 import QrcodeVue from 'qrcode.vue' 88 import QrcodeVue from 'qrcode.vue'
89 import { DICT_TYPE, getDictDatas } from "@/utils/dict"; 89 import { DICT_TYPE, getDictDatas } from "@/utils/dict";
90 import { getOrder, submitOrder } from '@/api/pay/order'; 90 import { getOrder, submitOrder } from '@/api/pay/order';
91 -import {PayChannelEnum, PayDisplayModeEnum, PayOrderStatusEnum} from "@/utils/constants"; 91 +import { PayChannelEnum, PayDisplayModeEnum, PayOrderStatusEnum } from "@/utils/constants";
92 92
93 export default { 93 export default {
94 - name: "PayOrderSubmit", 94 + name: "PayCashier",
95 components: { 95 components: {
96 QrcodeVue, 96 QrcodeVue,
97 }, 97 },
98 data() { 98 data() {
99 return { 99 return {
100 id: undefined, // 请假编号 100 id: undefined, // 请假编号
  101 + returnUrl: undefined, // 支付完的回调地址
101 loading: false, // 支付信息的 loading 102 loading: false, // 支付信息的 loading
102 payOrder: {}, // 支付信息 103 payOrder: {}, // 支付信息
103 aliPayChannels: [], // 阿里支付的渠道 104 aliPayChannels: [], // 阿里支付的渠道
@@ -139,6 +140,9 @@ export default { @@ -139,6 +140,9 @@ export default {
139 }, 140 },
140 created() { 141 created() {
141 this.id = this.$route.query.id; 142 this.id = this.$route.query.id;
  143 + if (this.$route.query.returnUrl) {
  144 + this.returnUrl = decodeURIComponent(this.$route.query.returnUrl)
  145 + }
142 this.getDetail(); 146 this.getDetail();
143 this.initPayChannels(); 147 this.initPayChannels();
144 }, 148 },
@@ -296,7 +300,8 @@ export default { @@ -296,7 +300,8 @@ export default {
296 }, 300 },
297 /** 提交支付后，URL 的展示形式 */ 301 /** 提交支付后，URL 的展示形式 */
298 displayUrl(channelCode, data) { 302 displayUrl(channelCode, data) {
299 - window.open(data.displayContent) 303 + // window.open(data.displayContent)window
  304 + location.href = data.displayContent
300 this.submitLoading = false 305 this.submitLoading = false
301 }, 306 },
302 /** 提交支付后，Form 的展示形式 */ 307 /** 提交支付后，Form 的展示形式 */
@@ -369,6 +374,10 @@ export default { @@ -369,6 +374,10 @@ export default {
369 goBackToList() { 374 goBackToList() {
370 this.$tab.closePage(); 375 this.$tab.closePage();
371 this.$router.go(-1); 376 this.$router.go(-1);
  377 + // TODO 芋艿：需要优化；
  378 + // this.$router.push({
  379 + // path: this.returnUrl
  380 + // });
372 } 381 }
373 } 382 }
374 }; 383 };
yudao-ui-admin/src/views/pay/demo/index.vue
  View file @2485a5e
@@ -29,9 +29,9 @@ @@ -29,9 +29,9 @@
29 </template> 29 </template>
30 </el-table-column> 30 </el-table-column>
31 <el-table-column label="支付单号" align="center" prop="payOrderId" /> 31 <el-table-column label="支付单号" align="center" prop="payOrderId" />
32 - <el-table-column label="是否支付" align="center" prop="payed"> 32 + <el-table-column label="是否支付" align="center" prop="payStatus">
33 <template v-slot="scope"> 33 <template v-slot="scope">
34 - <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.payed" /> 34 + <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.payStatus" />
35 </template> 35 </template>
36 </el-table-column> 36 </el-table-column>
37 <el-table-column label="支付时间" align="center" prop="payTime" width="180"> 37 <el-table-column label="支付时间" align="center" prop="payTime" width="180">
@@ -47,9 +47,9 @@ @@ -47,9 +47,9 @@
47 <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> 47 <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
48 <template v-slot="scope"> 48 <template v-slot="scope">
49 <el-button size="mini" type="text" icon="el-icon-edit" @click="handlePay(scope.row)" 49 <el-button size="mini" type="text" icon="el-icon-edit" @click="handlePay(scope.row)"
50 - v-if="!scope.row.payed">前往支付</el-button> 50 + v-if="!scope.row.payStatus">前往支付</el-button>
51 <el-button size="mini" type="text" icon="el-icon-delete" @click="handleRefund(scope.row)" 51 <el-button size="mini" type="text" icon="el-icon-delete" @click="handleRefund(scope.row)"
52 - v-if="scope.row.payed && !scope.row.payRefundId">发起退款</el-button> 52 + v-if="scope.row.payStatus && !scope.row.payRefundId">发起退款</el-button>
53 </template> 53 </template>
54 </el-table-column> 54 </el-table-column>
55 </el-table> 55 </el-table>
@@ -78,12 +78,10 @@ @@ -78,12 +78,10 @@
78 </template> 78 </template>
79 79
80 <script> 80 <script>
81 -import {createDemoOrder, getDemoOrderPage, refundDemoOrder} from "@/api/pay/demo"; 81 +import { createDemoOrder, getDemoOrderPage, refundDemoOrder } from "@/api/pay/demo";
82 82
83 export default { 83 export default {
84 name: "PayDemoOrder", 84 name: "PayDemoOrder",
85 - components: {  
86 - },  
87 data() { 85 data() {
88 return { 86 return {
89 // 遮罩层 87 // 遮罩层
@@ -192,9 +190,10 @@ export default { @@ -192,9 +190,10 @@ export default {
192 /** 支付按钮操作 */ 190 /** 支付按钮操作 */
193 handlePay(row) { 191 handlePay(row) {
194 this.$router.push({ 192 this.$router.push({
195 - name: 'PayOrderSubmit', 193 + name: 'PayCashier',
196 query:{ 194 query:{
197 - id: row.payOrderId 195 + id: row.payOrderId,
  196 + returnUrl: encodeURIComponent('/pay/demo-order?id=' + row.id)
198 } 197 }
199 }) 198 })
200 }, 199 },
yudao-ui-admin/src/views/pay/order/index.vue
  View file @2485a5e
@@ -81,19 +81,19 @@ @@ -81,19 +81,19 @@
81 </template> 81 </template>
82 </el-table-column> 82 </el-table-column>
83 <el-table-column label="商品标题" align="center" prop="subject" width="180" :show-overflow-tooltip="true"/> 83 <el-table-column label="商品标题" align="center" prop="subject" width="180" :show-overflow-tooltip="true"/>
84 - <el-table-column label="支付金额" align="center" prop="amount" width="100"> 84 + <el-table-column label="支付金额" align="center" prop="price" width="100">
85 <template v-slot="scope"> 85 <template v-slot="scope">
86 - ￥{{ parseFloat(scope.row.amount / 100).toFixed(2) }} 86 + ￥{{ parseFloat(scope.row.price / 100).toFixed(2) }}
87 </template> 87 </template>
88 </el-table-column> 88 </el-table-column>
89 - <el-table-column label="手续金额" align="center" prop="channelFeeAmount" width="100"> 89 + <el-table-column label="手续金额" align="center" prop="channelFeePrice" width="100">
90 <template v-slot="scope"> 90 <template v-slot="scope">
91 - ￥{{ parseFloat(scope.row.channelFeeAmount / 100).toFixed(2) }} 91 + ￥{{ parseFloat(scope.row.channelFeePrice / 100).toFixed(2) }}
92 </template> 92 </template>
93 </el-table-column> 93 </el-table-column>
94 - <el-table-column label="退款金额" align="center" prop="refundAmount" width="100"> 94 + <el-table-column label="退款金额" align="center" prop="refundPrice" width="100">
95 <template v-slot="scope"> 95 <template v-slot="scope">
96 - ￥{{ parseFloat(scope.row.refundAmount / 100).toFixed(2) }} 96 + ￥{{ parseFloat(scope.row.refundPrice / 100).toFixed(2) }}
97 </template> 97 </template>
98 </el-table-column> 98 </el-table-column>
99 <el-table-column label="支付状态" align="center" prop="status"> 99 <el-table-column label="支付状态" align="center" prop="status">
@@ -154,10 +154,10 @@ @@ -154,10 +154,10 @@
154 </el-tag> 154 </el-tag>
155 </el-descriptions-item> 155 </el-descriptions-item>
156 <el-descriptions-item label="金额"> 156 <el-descriptions-item label="金额">
157 - <el-tag type="success" size="small">{{ parseFloat(orderDetail.amount / 100, 2) }}</el-tag> 157 + <el-tag type="success" size="small">{{ parseFloat(orderDetail.price / 100, 2) }}</el-tag>
158 </el-descriptions-item> 158 </el-descriptions-item>
159 <el-descriptions-item label="手续费"> 159 <el-descriptions-item label="手续费">
160 - <el-tag type="warning" size="small">{{ parseFloat(orderDetail.channelFeeAmount / 100, 2) }}</el-tag> 160 + <el-tag type="warning" size="small">{{ parseFloat(orderDetail.channelFeePrice / 100, 2) }}</el-tag>
161 </el-descriptions-item> 161 </el-descriptions-item>
162 <el-descriptions-item label="手续费比例"> 162 <el-descriptions-item label="手续费比例">
163 {{ parseFloat(orderDetail.channelFeeRate / 100, 2) }}% 163 {{ parseFloat(orderDetail.channelFeeRate / 100, 2) }}%
@@ -184,7 +184,7 @@ @@ -184,7 +184,7 @@
184 <el-descriptions-item label="退款次数">{{ orderDetail.refundTimes }}</el-descriptions-item> 184 <el-descriptions-item label="退款次数">{{ orderDetail.refundTimes }}</el-descriptions-item>
185 <el-descriptions-item label="退款金额"> 185 <el-descriptions-item label="退款金额">
186 <el-tag type="warning"> 186 <el-tag type="warning">
187 - {{ parseFloat(orderDetail.refundAmount / 100, 2) }} 187 + {{ parseFloat(orderDetail.refundPrice / 100, 2) }}
188 </el-tag> 188 </el-tag>
189 </el-descriptions-item> 189 </el-descriptions-item>
190 </el-descriptions> 190 </el-descriptions>
@@ -213,16 +213,16 @@ const defaultOrderDetail = { @@ -213,16 +213,16 @@ const defaultOrderDetail = {
213 merchantOrderId: null, 213 merchantOrderId: null,
214 channelOrderNo: '', 214 channelOrderNo: '',
215 body: '', 215 body: '',
216 - amount: null, 216 + price: null,
217 channelFeeRate: null, 217 channelFeeRate: null,
218 - channelFeeAmount: null, 218 + channelFeePrice: null,
219 userIp: '', 219 userIp: '',
220 status: null, 220 status: null,
221 notifyUrl: '', 221 notifyUrl: '',
222 notifyStatus: null, 222 notifyStatus: null,
223 refundStatus: null, 223 refundStatus: null,
224 refundTimes: '', 224 refundTimes: '',
225 - refundAmount: null, 225 + refundPrice: null,
226 createTime: '', 226 createTime: '',
227 successTime: '', 227 successTime: '',
228 notifyTime: '', 228 notifyTime: '',
@@ -262,15 +262,15 @@ export default { @@ -262,15 +262,15 @@ export default {
262 body: null, 262 body: null,
263 notifyUrl: null, 263 notifyUrl: null,
264 notifyStatus: null, 264 notifyStatus: null,
265 - amount: null, 265 + price: null,
266 channelFeeRate: null, 266 channelFeeRate: null,
267 - channelFeeAmount: null, 267 + channelFeePrice: null,
268 status: null, 268 status: null,
269 userIp: null, 269 userIp: null,
270 successExtensionId: null, 270 successExtensionId: null,
271 refundStatus: null, 271 refundStatus: null,
272 refundTimes: null, 272 refundTimes: null,
273 - refundAmount: null, 273 + refundPrice: null,
274 channelUserId: null, 274 channelUserId: null,
275 channelOrderNo: null, 275 channelOrderNo: null,
276 expireTime: [], 276 expireTime: [],
yudao-ui-admin/src/views/pay/refund/index.vue
  View file @2485a5e
@@ -95,14 +95,14 @@ @@ -95,14 +95,14 @@
95 </p> 95 </p>
96 </template> 96 </template>
97 </el-table-column> 97 </el-table-column>
98 - <el-table-column label="支付金额(元)" align="center" prop="payAmount" width="100"> 98 + <el-table-column label="支付金额(元)" align="center" prop="payPrice" width="100">
99 <template v-slot="scope" class=""> 99 <template v-slot="scope" class="">
100 - ￥{{ parseFloat(scope.row.payAmount / 100).toFixed(2) }} 100 + ￥{{ parseFloat(scope.row.payPrice / 100).toFixed(2) }}
101 </template> 101 </template>
102 </el-table-column> 102 </el-table-column>
103 - <el-table-column label="退款金额(元)" align="center" prop="refundAmount" width="100"> 103 + <el-table-column label="退款金额(元)" align="center" prop="refundPrice" width="100">
104 <template v-slot="scope"> 104 <template v-slot="scope">
105 - ￥{{ parseFloat(scope.row.refundAmount / 100).toFixed(2) }} 105 + ￥{{ parseFloat(scope.row.refundPrice / 100).toFixed(2) }}
106 </template> 106 </template>
107 </el-table-column> 107 </el-table-column>
108 <el-table-column label="退款类型" align="center" prop="type" width="80"> 108 <el-table-column label="退款类型" align="center" prop="type" width="80">
@@ -160,10 +160,10 @@ @@ -160,10 +160,10 @@
160 <el-divider></el-divider> 160 <el-divider></el-divider>
161 <el-descriptions :column="2" label-class-name="desc-label"> 161 <el-descriptions :column="2" label-class-name="desc-label">
162 <el-descriptions-item label="支付金额"> 162 <el-descriptions-item label="支付金额">
163 - {{ parseFloat(refundDetail.payAmount / 100).toFixed(2) }} 163 + {{ parseFloat(refundDetail.payPrice / 100).toFixed(2) }}
164 </el-descriptions-item> 164 </el-descriptions-item>
165 <el-descriptions-item label="退款金额" size="mini"> 165 <el-descriptions-item label="退款金额" size="mini">
166 - <el-tag class="tag-purple" size="mini">{{ parseFloat(refundDetail.refundAmount / 100).toFixed(2) }}</el-tag> 166 + <el-tag class="tag-purple" size="mini">{{ parseFloat(refundDetail.refundPrice / 100).toFixed(2) }}</el-tag>
167 </el-descriptions-item> 167 </el-descriptions-item>
168 <el-descriptions-item label="退款类型"> 168 <el-descriptions-item label="退款类型">
169 <template v-slot="scope"> 169 <template v-slot="scope">
@@ -234,9 +234,9 @@ const defaultRefundDetail = { @@ -234,9 +234,9 @@ const defaultRefundDetail = {
234 notifyTime: null, 234 notifyTime: null,
235 notifyUrl: '', 235 notifyUrl: '',
236 orderId: null, 236 orderId: null,
237 - payAmount: null, 237 + payPrice: null,
238 reason: '', 238 reason: '',
239 - refundAmount: null, 239 + refundPrice: null,
240 status: null, 240 status: null,
241 subject: '', 241 subject: '',
242 successTime: null, 242 successTime: null,
@@ -277,8 +277,8 @@ export default { @@ -277,8 +277,8 @@ export default {
277 notifyStatus: null, 277 notifyStatus: null,
278 status: null, 278 status: null,
279 type: null, 279 type: null,
280 - payAmount: null,  
281 - refundAmount: null, 280 + payPrice: null,
  281 + refundPrice: null,
282 reason: null, 282 reason: null,
283 userIp: null, 283 userIp: null,
284 channelOrderNo: null, 284 channelOrderNo: null,