From 865918dcae73c36d1694a53ac54a24b73dc89776 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 14 Oct 2021 12:00:21 +0800 Subject: [PATCH] =?UTF-8?q?fix=20bug=2040606=20=E5=88=86=E6=A0=87=E5=A7=94?= =?UTF-8?q?-=E4=BC=9A=E8=AE=AE=E7=BB=B4=E6=8A=A4-=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=97=B6=E3=80=82=E6=8A=A5=EF=BC=9A=E8=AF=B7=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=9C=89=E6=95=88=E5=86=85=E5=AE=B9=E3=80=90=E9=98=BB=E5=A1=9E?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/common/dto/SendMessageDTO.java | 4 +++ .../service/impl/SendMessageServiceImpl.java | 35 ++++++++++--------- .../service/impl/PayMeetingServiceImpl.java | 22 ++++++------ 3 files changed, 33 insertions(+), 28 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 6ce37a55..b578be0d 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 @@ -41,6 +41,10 @@ public class SendMessageDTO implements Serializable { * 模板编码 */ private String templateCode; + /** + * 是否使用模板 + */ + private Boolean useTemplate; /** * 模板参数 */ 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 a1e9d603..275492ed 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 @@ -73,23 +73,26 @@ public class SendMessageServiceImpl implements SendMessageService { //模板内容 String content = sysSmsTemplate.getTemplateContent(); HashMap map = sendMessageDTO.getTemplateParam(); - if(!Objects.isNull(map)) { - // 替换企业端系统url与小程序名称 - // todo 替换系统地址，小程序名称 - if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG2.getCode()) - || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG3.getCode()) - || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG4.getCode()) - || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG6.getCode()) - || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG7.getCode()) - || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG12.getCode())){ - map.put("systemAddress",env.getProperty("message.systemUrl")); - map.put("wxName",env.getProperty("message.wxName")); + if (Objects.equals(sendMessageDTO.getUseTemplate(),false)){ + content = map.get("value"); + }else { + if(!Objects.isNull(map)) { + // 替换企业端系统url与小程序名称 + // todo 替换系统地址，小程序名称 + if(Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG2.getCode()) + || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG3.getCode()) + || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG4.getCode()) + || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG6.getCode()) + || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG7.getCode()) + || Objects.equals(sendMessageDTO.getTemplateCode(),CompanyMessageEnums.MSG12.getCode())){ + map.put("systemAddress",env.getProperty("message.systemUrl")); + map.put("wxName",env.getProperty("message.wxName")); + } + for (Map.Entry entry : map.entrySet()) { + String str = "${" + entry.getKey() + "}"; + content = content.replace(str, entry.getValue()); + } } - for (Map.Entry entry : map.entrySet()) { - String str = "${" + entry.getKey() + "}"; - content = content.replace(str, entry.getValue()); - } - } // 1短信 2邮件 3系统 // 发送邮件 true 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 03af0bdc..25cf9edd 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 @@ -453,19 +453,17 @@ public class PayMeetingServiceImpl extends ServiceImpl map = new HashMap<>(); - map.put("meetingName",payMeeting.getMeetingName()); + if (StringUtils.isNotBlank(payMeeting.getNotice())){ + sendMessageDTO.setUseTemplate(false); + map.put("value",payMeeting.getNotice()); + }else { + map.put("meetingName",payMeeting.getMeetingName()); + } + sendMessageDTO.setEmail(PasswordUtil.decrypt(email)); + sendMessageDTO.setToUser(PasswordUtil.decrypt(phone)); + sendMessageDTO.setPhone(PasswordUtil.decrypt(phone)); + sendMessageDTO.setFromUser(director.getUsername()); sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG1.getCode()); sendMessageDTO.setTemplateParam(map);