From 4ab24758d3e6fc03f15cbfa17b5ba05ed886b56f Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期日, 28 四月 2024 23:31:19 +0800
Subject: [PATCH] 4.28
---
rest/src/main/java/cn/stylefeng/rest/modular/user/controller/CounsellingInfoController.java | 4 ++--
common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/MentalAppointmentServiceImpl.java | 2 +-
2 files changed, 3 insertions(+), 3 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 d0654b0..81332d8 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
@@ -159,7 +159,7 @@
Wrappers.<MentalAppointment>lambdaQuery()
.eq(MentalAppointment::getAppointmentDay, appointmentDayYmd)
.eq(MentalAppointment::getBeginTimePoint, beginTimePoint)
- .eq(MentalAppointment::getEndTimePoint, endTimePoint)
+ .eq(MentalAppointment::getEndTimePoint, endTimePoint).ne(MentalAppointment::getType,1)
.in(MentalAppointment::getStatusFlag, Arrays.asList(
MentalAppointmentStatusEnum.WAIT_PAY.getCode(),
MentalAppointmentStatusEnum.WAIT_SERVICE.getCode(),
diff --git a/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/CounsellingInfoController.java b/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/CounsellingInfoController.java
index 45ffed8..d963ffa 100644
--- a/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/CounsellingInfoController.java
+++ b/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/CounsellingInfoController.java
@@ -710,8 +710,8 @@
// 发送IM消息
ImPushDataDTO pushData1 = ImPushDataDTO.builder()
- .type(ImPushTypeEnum.C_TO_W_IM_1V1_START_CONSULT.getCode())
- .title(ImPushTypeEnum.C_TO_W_IM_1V1_START_CONSULT.getName())
+ .type(ImPushTypeEnum.C_TO_W_IM_1V1_START_CONSULT_FIRST.getCode())
+ .title(ImPushTypeEnum.C_TO_W_IM_1V1_START_CONSULT_FIRST.getName())
.content("预约成功"+",请注意预约时间："+counsellingReservationRequest.getDayTime()+counsellingReservationRequest.getTimePoint())
// .content("预约成功！")
.objId(ObjUtil.toString(counsellingInfo.getId()))
--
Gitblit v1.7.1