From e661ea6782bf6e7283689224506eef0869a27e6d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 19 十二月 2024 14:58:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 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 4726292..4f08d14 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
@@ -153,9 +153,9 @@
//鍙戦�佷細璁绾︽垚鍔熼�氱煡
if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
this.sendNotice(bookings, MeetConstants.TWO);
+ SystemUser systemUser = systemUserMapper.selectById(user.getId());
+ this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ZERO);
}
- SystemUser systemUser = systemUserMapper.selectById(user.getId());
- this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ZERO);
return bookings.getId();
}
@@ -386,9 +386,9 @@
//鍙戦�佷細璁�氱煡
if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
this.sendNotice(bookings, MeetConstants.TWO);
+ SystemUser systemUser = systemUserMapper.selectById(bookings.getUserId());
+ this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ZERO);
}
- SystemUser systemUser = systemUserMapper.selectById(bookings.getUserId());
- this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ZERO);
}
@Override
@@ -458,9 +458,8 @@
//鍙栨秷浼氳 鍙戦�佸彇娑堥�氱煡
if(Constants.equalsInteger(bookings.getJoinNotice(),Constants.ZERO)){
this.sendNotice(bookings, 3);
+ this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ONE);
}
- this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ONE);
-
}
@Override
@@ -1416,7 +1415,7 @@
if(Constants.equalsInteger(sendType,Constants.ZERO)){
wxPlatNotice.sendMeetingBookTemplateNotice(systemDictDataBiz,bookings,"CuoDoxOl6SFwi4NhNgOQgKSJVjDD4VCIaPYlnbv_zdY",
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),openIds);
- }else{
+ }else if(Constants.equalsInteger(sendType,Constants.ONE)){
wxPlatNotice.sendMeetingBookCancelTemplateNotice(systemDictDataBiz,bookings,"CiB6vCT2InovAoQfudY-lvzLSV0-3lfz3a5GsSFCzd8",
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM, Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),openIds);
}
--
Gitblit v1.9.3