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