parent: 6d72bb2e | 补丁 | 提交 | ignore whitespace
luodangjia
2024-04-28 4ab24758d3e6fc03f15cbfa17b5ba05ed886b56f 
4.28
2个文件已修改
6 ■■■■■ 已修改文件
common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/MentalAppointmentServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rest/src/main/java/cn/stylefeng/rest/modular/user/controller/CounsellingInfoController.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 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(),




 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()))