From 6d74380a1b8a459cb97e6bf54315bbbbb210e832 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 18 四月 2024 21:44:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
rest/src/main/java/cn/stylefeng/rest/modular/order/service/MentalTestOrderBizService.java | 10 +++++-----
rest/src/main/java/cn/stylefeng/rest/modular/order/controller/MentalTestOrderController.java | 6 +++---
rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java | 7 +++++--
3 files changed, 13 insertions(+), 10 deletions(-)
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 b311197..58f62e8 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
@@ -99,12 +99,12 @@
Assert.isTrue(StrUtil.isNotBlank(req.getLinkPhone()), "联系电话不能为空");
OrderConsultOne o = mentalTestOrderBizService.createOrderConsultOne(req);
try {
- Customer customer =new Customer();
- BeanUtil.copyProperties(req,customer);
+ Customer customer = new Customer();
+ BeanUtil.copyProperties(req, customer);
LoginUser loginUser = LoginContext.me().getLoginUser();
customer.setCustomerId(loginUser.getUserId());
customerService.updateById(customer);
- }catch (Exception e){
+ } catch (Exception e) {
log.info("修改用户信息报错");
}
return new SuccessResponseData(o);
diff --git a/rest/src/main/java/cn/stylefeng/rest/modular/order/service/MentalTestOrderBizService.java b/rest/src/main/java/cn/stylefeng/rest/modular/order/service/MentalTestOrderBizService.java
index c67a4e6..c709ab4 100644
--- a/rest/src/main/java/cn/stylefeng/rest/modular/order/service/MentalTestOrderBizService.java
+++ b/rest/src/main/java/cn/stylefeng/rest/modular/order/service/MentalTestOrderBizService.java
@@ -165,7 +165,7 @@
}
// 保存1v1性格分析预约，并推送消息给工作人员
- MentalAppointment mentalAppointment = saveMentalAppointmentPushMessage(o.getStatusFlag(), o);
+ MentalAppointment mentalAppointment = saveMentalAppointmentPushMessage(o.getStatusFlag(), o, req.getRealName(), req.getLinkPhone());
if (mentalAppointment == null) {
throw new BusinessException(DefaultBusinessExceptionEnum.MENTAL_APPOINTMENT_NO_WORKER_ERROR);
}
@@ -197,7 +197,7 @@
* @param o
* @return
*/
- public MentalAppointment saveMentalAppointmentPushMessage(Integer orderConsultOneStatusFlag, OrderConsultOne o) {
+ public MentalAppointment saveMentalAppointmentPushMessage(Integer orderConsultOneStatusFlag, OrderConsultOne o, String realName, String linkPhone) {
// 性格分析预约
MentalAppointment mentalAppointment = MentalAppointment.builder()
.userId(o.getUserId())
@@ -207,9 +207,9 @@
.build();
// 用户信息
- CustomerInfo customerInfo = customerService.getCustomerInfoById(o.getUserId());
- mentalAppointment.setUserName(customerInfo.getRealName());
- mentalAppointment.setPhone(customerInfo.getLinkPhone());
+ //CustomerInfo customerInfo = customerService.getCustomerInfoById(o.getUserId());
+ mentalAppointment.setUserName(realName);
+ mentalAppointment.setPhone(linkPhone);
// 分配性格分析师
Long consultWorkerId = mentalAppointmentService.assignMentalAppointmentWorkerId(o.getAppointmentDay(), o.getBeginTimePoint(), o.getEndTimePoint());
diff --git a/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java b/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java
index d1ba976..84f38e2 100644
--- a/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java
+++ b/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java
@@ -182,13 +182,16 @@
// 获取绑定顾问岗位ID
String[] bindWorkerPostIds = customerService.getBindWorkerPostIds(workerNo, post11Enum, post21Enum);
+ Customer workerByNo = customerService.getOne(
+ Wrappers.<Customer>lambdaUpdate().eq(Customer::getWorkerNo, workerNo).last("LIMIT 1")
+ );
LambdaUpdateWrapper<Customer> wrapper = Wrappers.<Customer>lambdaUpdate().eq(Customer::getCustomerId, userId);
for (String postId : bindWorkerPostIds) {
if (postId.equals(post11Enum.getCode().toString())) {
- wrapper.set(Customer::getClassWorkerId, userId);
+ wrapper.set(Customer::getClassWorkerId, workerByNo.getCustomerId());
} else if (postId.equals(post21Enum.getCode().toString())) {
- wrapper.set(Customer::getConsultWorkerId, userId);
+ wrapper.set(Customer::getConsultWorkerId, workerByNo.getCustomerId());
}
}
--
Gitblit v1.7.1