From f46aa12cdf876e347c2710e87fda731eca7b91ac Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 20 Oct 2021 11:00:59 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=9A=E8=AE=AE=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E6=AD=A3=E6=96=87=E4=BC=9A=E5=BD=B1=E5=93=8D=E5=8F=91=E9=80=81?= =?UTF-8?q?=E7=9F=AD=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/common/dto/SendMessageDTO.java | 4 ++-- .../com/jero/common/service/impl/SendMessageServiceImpl.java | 4 ++-- .../com/jero/meeting/service/impl/PayMeetingServiceImpl.java | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/dto/SendMessageDTO.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/dto/SendMessageDTO.java index b578be0d..178f2fda 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/dto/SendMessageDTO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/dto/SendMessageDTO.java @@ -42,9 +42,9 @@ public class SendMessageDTO implements Serializable { */ private String templateCode; /** - * 是否使用模板 + * 会议通知正文 */ - private Boolean useTemplate; + private String MeetingNotice; /** * 模板参数 */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java index 0645d768..1c063aee 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java @@ -116,8 +116,8 @@ public class SendMessageServiceImpl implements SendMessageService { emailHandle.SendMsgAndFile(sendMessageDTO.getEmail(), title, content,sendMessageDTO.getListFile()); }else{ //如果有通知内容就替换 - if (Objects.equals(sendMessageDTO.getUseTemplate(),false)){ - emailHandle.SendMsg(sendMessageDTO.getEmail(), title, map.get("value")); + if (StringUtils.isNotBlank(sendMessageDTO.getMeetingNotice())){ + emailHandle.SendMsg(sendMessageDTO.getEmail(), title, sendMessageDTO.getMeetingNotice()); }else { emailHandle.SendMsg(sendMessageDTO.getEmail(), title, content); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index 0c4b2eb9..d1730c83 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -465,8 +465,7 @@ public class PayMeetingServiceImpl extends ServiceImpl map = new HashMap<>(); if (StringUtils.isNotBlank(payMeeting.getNotice())){ - sendMessageDTO.setUseTemplate(false); - map.put("value",payMeeting.getNotice()); + sendMessageDTO.setMeetingNotice(payMeeting.getNotice()); } map.put("meetingName",payMeeting.getMeetingName());