From 64e1ab50bef322b0fb8893a6fad344ca9f2caf78 Mon Sep 17 00:00:00 2001
From: goupan <goupan@chinapopin.com>
Date: 星期日, 21 四月 2024 23:25:18 +0800
Subject: [PATCH] 修改bug
---
rest/src/main/java/cn/stylefeng/rest/modular/order/controller/MentalTestOrderController.java | 9 ---------
common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/MentalAppointmentServiceImpl.java | 2 +-
2 files changed, 1 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/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);
}
--
Gitblit v1.7.1