From 1901fceb6ddaa56a57f3131191454554c3e77e68 Mon Sep 17 00:00:00 2001
From: guohongjin <guohongjin@test.com>
Date: 星期三, 01 五月 2024 13:56:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PsychologicalCounseling
---
common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/CounsellingOrderServiceImpl.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/CounsellingOrderServiceImpl.java b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/CounsellingOrderServiceImpl.java
index 0215c01..54a696d 100644
--- a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/CounsellingOrderServiceImpl.java
+++ b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/service/impl/CounsellingOrderServiceImpl.java
@@ -226,19 +226,19 @@
- // 推送消息内容
- String pushContent = "你有新的预约，请注意查收。预约用户："+customerOld.getNickName();
-// +"预约时间："+counsellingOrder.getEffectiveEndTime()+"~"+counsellingOrder.getEffectiveEndTime();
- // IM推送数据json
- ImPushDataDTO pushData = ImPushDataDTO.builder()
- .type(ImPushTypeEnum.S_TO_W_TIP_CONSULT_PAY_GROUP_SUCCESS_ONLY.getCode())
- .objId(ObjUtil.toString(counsellingInfo.getUserId()))
- .title("通知")
- .content(pushContent)
-// .extra("去查看。")
- .build();
- // 发送预约提示
- imBizService.messageSendSystem(counsellingOrder.getUserId()+"", new String[]{counsellingInfo.getUserId()+""}, pushData, ImUserTypeEnum.WORKER, PostIdEnum.PO_22, true);
+// // 推送消息内容
+// String pushContent = "你有新的预约，请注意查收。预约用户："+customerOld.getNickName();
+//// +"预约时间："+counsellingOrder.getEffectiveEndTime()+"~"+counsellingOrder.getEffectiveEndTime();
+// // IM推送数据json
+// ImPushDataDTO pushData = ImPushDataDTO.builder()
+// .type(ImPushTypeEnum.S_TO_W_TIP_CONSULT_PAY_GROUP_SUCCESS_ONLY.getCode())
+// .objId(ObjUtil.toString(counsellingInfo.getUserId()))
+// .title("通知")
+// .content(pushContent)
+//// .extra("去查看。")
+// .build();
+// // 发送预约提示
+// imBizService.messageSendSystem(counsellingOrder.getUserId()+"", new String[]{counsellingInfo.getUserId()+""}, pushData, ImUserTypeEnum.WORKER, PostIdEnum.PO_22, true);
}else if (counsellingOrderRequest.getOrderType().intValue() ==2){
//获取下单人个人信息
Customer customerUser = this.customerService.getById(counsellingOrderRequest.getUserId());
@@ -547,8 +547,8 @@
String formattedDate = formatter.format(counsellingOrder.getFirstAppointmentDate());
// 发送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("预约成功"+",请注意预约时间："+formattedDate+counsellingOrder.getFirstAppointmentTimes())
// .content("预约成功！")
.objId(ObjUtil.toString(counsellingInfo.getId()))
--
Gitblit v1.7.1