From 8bd6e0f1c84f2bc5bf2b9555d1c5fb388565db6c Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 11 十二月 2024 19:17:12 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
index ea320cd..16e2bcb 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
@@ -452,11 +452,13 @@
bookings.setEditDate(new Date());
bookings.setEditor(user.getId());
bookingsMapper.updateById(bookings);
+ SystemUser systemUser = systemUserMapper.selectById(bookings.getCreator());
+
+ bookings.setManagerInfo(systemUser.getRealname());
//鍙栨秷浼氳 鍙戦�佸彇娑堥�氱煡
if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
this.sendNotice(bookings, 3);
}
- SystemUser systemUser = systemUserMapper.selectById(bookings.getUserId());
this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ONE);
}
@@ -1053,12 +1055,12 @@
}
bookingsMapper.updateById(bookings);
//鍙栨秷浼氳 鍙戦�佸彇娑堥�氱煡
- if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
- this.sendNotice(bookings, 3);
- }
- SystemUser systemUser = systemUserMapper.selectById(bookings.getUserId());
+// if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
+// this.sendNotice(bookings, 3);
+// }
+ SystemUser systemUser = systemUserMapper.selectById(bookings.getCreator());
+ bookings.setManagerInfo(systemUser.getRealname());
this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ONE);
-
}
@@ -1338,6 +1340,10 @@
Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.MEETING_START;
if (sendType.equals(MeetConstants.THREE)){
noticeObjectType = Constants.NoticeObjectType.MEETING_CACEL;
+ smsConfig = smsConfigMapper.selectOne(new QueryWrapper<SmsConfig>().lambda().eq(SmsConfig::getCode,
+ SmsConstants.meetingContent.meetingBookCancel)
+ .eq(SmsConfig::getIsdeleted,Constants.ZERO)
+ .last(" limit 1 "));
}else if (sendType.equals(MeetConstants.TWO)){
noticeObjectType = Constants.NoticeObjectType.MEETING_BOOK_SUCCESS;
smsConfig = smsConfigMapper.selectOne(new QueryWrapper<SmsConfig>().lambda().eq(SmsConfig::getCode,
@@ -1406,11 +1412,10 @@
if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(openIds)){
WxPlatNotice wxPlatNotice = new WxPlatNotice();
if(Constants.equalsInteger(sendType,Constants.ZERO)){
- wxPlatNotice.sendMeetingBookTemplateNotice(bookings,"CuoDoxOl6SFwi4NhNgOQgKSJVjDD4VCIaPYlnbv_zdY",
+ wxPlatNotice.sendMeetingBookTemplateNotice(systemDictDataBiz,bookings,"CuoDoxOl6SFwi4NhNgOQgKSJVjDD4VCIaPYlnbv_zdY",
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),openIds);
}else{
-
- wxPlatNotice.sendMeetingBookCancelTemplateNotice(bookings,"CiB6vCT2InovAoQfudY-lvzLSV0-3lfz3a5GsSFCzd8",
+ wxPlatNotice.sendMeetingBookCancelTemplateNotice(systemDictDataBiz,bookings,"CiB6vCT2InovAoQfudY-lvzLSV0-3lfz3a5GsSFCzd8",
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),openIds);
}
}
--
Gitblit v1.9.3