From 9f9535f562cb8afdab63c8477ea2e3795651f25f Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 22 四月 2024 16:17:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
rest/src/main/java/cn/stylefeng/rest/modular/order/controller/MentalTestOrderController.java | 9 --
rest/src/main/java/cn/stylefeng/rest/modular/home/service/MentalTestBizService.java | 3
common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/MentalAppointmentServiceImpl.java | 2
sql/clear_data_20240419.sql | 197 +++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 201 insertions(+), 10 deletions(-)
diff --git a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/MentalAppointmentServiceImpl.java b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/MentalAppointmentServiceImpl.java
index dc5bd5f..d0654b0 100644
--- a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/MentalAppointmentServiceImpl.java
+++ b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/MentalAppointmentServiceImpl.java
@@ -161,10 +161,10 @@
.eq(MentalAppointment::getBeginTimePoint, beginTimePoint)
.eq(MentalAppointment::getEndTimePoint, endTimePoint)
.in(MentalAppointment::getStatusFlag, Arrays.asList(
+ MentalAppointmentStatusEnum.WAIT_PAY.getCode(),
MentalAppointmentStatusEnum.WAIT_SERVICE.getCode(),
MentalAppointmentStatusEnum.IN_SERVICE.getCode()
))
- .isNotNull(MentalAppointment::getWorkerId)
);
List<Long> neWorkerIdList = sameTimeAppointmentList.stream().map(MentalAppointment::getWorkerId).collect(Collectors.toList());
diff --git a/rest/src/main/java/cn/stylefeng/rest/modular/home/service/MentalTestBizService.java b/rest/src/main/java/cn/stylefeng/rest/modular/home/service/MentalTestBizService.java
index 6c012a7..d2312ca 100644
--- a/rest/src/main/java/cn/stylefeng/rest/modular/home/service/MentalTestBizService.java
+++ b/rest/src/main/java/cn/stylefeng/rest/modular/home/service/MentalTestBizService.java
@@ -60,6 +60,9 @@
public MentalTestRecord answerSubmit(MentalTestAnswerSubmitRequest req) {
// 获取用户信息
Customer customer = customerService.getById(req.getUserId());
+ if (customer == null) {
+ throw new RuntimeException("获取用户信息失败！");
+ }
// 获取用户咨询顾问ID
Long consultWorkerId;
if (customer != null && customer.getConsultWorkerId() != null) {
diff --git a/rest/src/main/java/cn/stylefeng/rest/modular/order/controller/MentalTestOrderController.java b/rest/src/main/java/cn/stylefeng/rest/modular/order/controller/MentalTestOrderController.java
index 58f62e8..77a0055 100644
--- a/rest/src/main/java/cn/stylefeng/rest/modular/order/controller/MentalTestOrderController.java
+++ b/rest/src/main/java/cn/stylefeng/rest/modular/order/controller/MentalTestOrderController.java
@@ -98,15 +98,6 @@
Assert.isTrue(StrUtil.isNotBlank(req.getRealName()), "姓名不能为空");
Assert.isTrue(StrUtil.isNotBlank(req.getLinkPhone()), "联系电话不能为空");
OrderConsultOne o = mentalTestOrderBizService.createOrderConsultOne(req);
- try {
- Customer customer = new Customer();
- BeanUtil.copyProperties(req, customer);
- LoginUser loginUser = LoginContext.me().getLoginUser();
- customer.setCustomerId(loginUser.getUserId());
- customerService.updateById(customer);
- } catch (Exception e) {
- log.info("修改用户信息报错");
- }
return new SuccessResponseData(o);
}
diff --git a/sql/clear_data_20240419.sql b/sql/clear_data_20240419.sql
new file mode 100644
index 0000000..fa3bf6a
--- /dev/null
+++ b/sql/clear_data_20240419.sql
@@ -0,0 +1,197 @@
+-- 数据库迁移
+-- DELETE FROM flyway_schema_history;
+-- 组织机构审批人
+DELETE FROM hr_org_approver;
+-- 组织机构信息
+-- DELETE FROM hr_organization WHERE org_id <> 1339554696976781407;
+-- 岗位信息
+-- DELETE FROM hr_position;
+
+
+-- 【IM业务】
+-- 消息群信息
+DELETE FROM im_group;
+-- 消息群用户
+DELETE FROM im_group_user;
+-- 消息通知
+DELETE FROM im_notice;
+-- IM用户在线状态
+DELETE FROM im_user_status;
+
+-- 【系统设置】
+-- 系统应用
+-- DELETE FROM sys_app;
+-- 参数配置
+-- DELETE FROM sys_config;
+-- 多数据源信息
+-- DELETE FROM sys_database_info;
+-- 字典
+-- DELETE FROM sys_dict;
+-- 字典类型
+-- DELETE FROM sys_dict_type;
+-- 业务拓展
+-- DELETE FROM sys_expand;
+-- 业务拓展-具体数据
+-- DELETE FROM sys_expand_data;
+-- 业务拓展-字段信息
+-- DELETE FROM sys_expand_field;
+-- 文件信息
+-- DELETE FROM sys_file_info;
+-- 文件存储信息
+-- DELETE FROM sys_file_storage;
+-- 业务分组
+-- DELETE FROM sys_group;
+-- 日志记录
+DELETE FROM sys_log;
+-- 登录记录
+DELETE FROM sys_login_log;
+-- 系统菜单
+-- DELETE FROM sys_menu;
+-- 菜单下的按钮
+-- DELETE FROM sys_menu_button;
+-- 菜单资源绑定
+-- DELETE FROM sys_menu_resource;
+-- 系统消息
+-- DELETE FROM sys_message;
+-- 通知管理
+-- DELETE FROM sys_notice;
+-- 资源
+-- DELETE FROM sys_resource;
+-- 系统角色
+-- DELETE FROM sys_role WHERE role_id <> 1;
+-- 角色数据范围
+-- DELETE FROM sys_role_data_scope;
+-- 角色菜单关联
+-- DELETE FROM sys_role_menu;
+-- 角色按钮关联
+-- DELETE FROM sys_role_menu_button;
+-- 角色资源关联
+-- DELETE FROM sys_role_resource;
+-- 短信发送记录
+DELETE FROM sys_sms;
+-- 常用功能的统计次数
+-- DELETE FROM sys_statistics_count;
+-- 常用功能列表
+-- DELETE FROM sys_statistics_url;
+-- 系统主题
+-- DELETE FROM sys_theme;
+-- 系统主题-模板
+-- DELETE FROM sys_theme_template;
+-- 系统主题-模板属性
+-- DELETE FROM sys_theme_template_field;
+-- 系统主题-模板配置关联关系
+-- DELETE FROM sys_theme_template_rel;
+-- 定时任务
+-- DELETE FROM sys_timers;
+-- 多语言
+-- DELETE FROM sys_translation;
+
+-- 系统用户
+-- DELETE FROM sys_user WHERE user_id <> 1;
+-- 用户数据范围
+-- DELETE FROM sys_user_data_scope;
+-- 用户组
+-- DELETE FROM sys_user_group;
+-- 用户组详情
+-- DELETE FROM sys_user_group_detail;
+-- 用户组织机构关联
+-- DELETE FROM sys_user_org;
+-- 用户角色关联
+-- DELETE FROM sys_user_role;
+
+
+-- 地区码表
+-- DELETE FROM t_area;
+
+
+-- 【基础数据】
+-- banner
+DELETE FROM t_banner;
+
+-- 【咨询】
+-- 合同签订记录
+DELETE FROM t_contract_record;
+-- 咨询师信息
+DELETE FROM t_counselling_info;
+-- 咨询订单信息
+DELETE FROM t_counselling_order;
+-- 咨询订单预约记录
+DELETE FROM t_counselling_order_reservation;
+-- 咨询记录信息
+DELETE FROM t_counselling_reservation_record;
+-- 咨询作业
+DELETE FROM t_counselling_reservation_work;
+-- 咨询套餐信息
+DELETE FROM t_counselling_set_meal;
+-- 咨询预约特殊时间配置
+DELETE FROM t_counselling_special_time_config;
+-- 咨询擅长领域标签表
+DELETE FROM t_counselling_tag;
+-- 咨询预约时间配置
+DELETE FROM t_counselling_time_config;
+
+
+-- 【课程】
+-- 课程管理
+DELETE FROM t_course;
+-- 章节管理
+DELETE FROM t_course_chapter;
+-- 课程订单信息
+DELETE FROM t_course_order;
+-- 课程学习笔记
+DELETE FROM t_course_study_note;
+-- 课程标签
+DELETE FROM t_course_tag;
+-- 课程学习记录
+DELETE FROM t_course_user_learned;
+-- 课程章节学习进度
+DELETE FROM t_couser_chapter_learning_rate;
+
+
+-- 【心理测试1v1咨询】
+-- 性格分析特殊时间配置
+DELETE FROM t_mental_analysis_special_time_config;
+-- 性格分析可预约时间
+DELETE FROM t_mental_analysis_time;
+-- 性格分析时间配置
+DELETE FROM t_mental_analysis_time_config;
+-- 性格分析预约
+DELETE FROM t_mental_appointment;
+-- 心理测试分类
+-- DELETE FROM t_mental_test_class;
+-- 心理测试选项
+DELETE FROM t_mental_test_option;
+-- 心理测试问题
+DELETE FROM t_mental_test_question;
+-- 心理测试记录
+DELETE FROM t_mental_test_record;
+-- 心理测试结果
+DELETE FROM t_mental_test_result;
+-- 心理测试结果配置
+DELETE FROM t_mental_test_result_set;
+-- 心理测试题库
+DELETE FROM t_mental_test_topic;
+-- 心理咨询1V1订单
+DELETE FROM t_order_consult_one;
+-- 心理测试订单
+DELETE FROM t_order_mental_test;
+
+
+-- 帮助
+DELETE FROM t_help;
+
+-- 心理专栏管理
+DELETE FROM t_psychological_column;
+-- 心理专栏阅读记录
+DELETE FROM t_psychological_read;
+
+-- 门店预约
+DELETE FROM t_store_appointment;
+
+-- 系统配置（H5、客服电话）
+-- DELETE FROM t_system_set;
+
+-- 用户评价表
+DELETE FROM t_user_evaluate;
+-- C端用户表
+DELETE FROM toc_customer WHERE customer_id <> 1;
\ No newline at end of file
--
Gitblit v1.7.1