From deae854e3531eb4508d16f649b5cf79464c99abc Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 21 Jul 2023 12:13:05 +0800 Subject: [PATCH] //..notice --- .../com/iformall/schedule/SharingOrderRedoSchedule.java | 9 ++++++--- .../com/iformall/service/impl/WxOrderServiceImpl.java | 4 ++++ .../iformall/service/msg/impl/SendEmailServiceImpl.java | 6 ++---- .../iformall/service/msg/impl/SendSmsServiceImpl.java | 6 ++---- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java index 81a9cb2d9..698b08d49 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java @@ -167,12 +167,17 @@ public class SharingOrderRedoSchedule { if(noticeContact == null){ return; } + Map msgReplaceMap = new HashMap(); + msgReplaceMap.put("mallName", mall.getName()); + if(StringUtils.isNotBlank(noticeContact.getPhone()) && EnumYesOrNo.YES.getCode().equals(noticeContact.getPhoneEnabled())){ WxMsgRecord wxMsgRecord = new WxMsgRecord(); wxMsgRecord.updateTenantInfo(mall); wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); wxMsgRecord.setModelType(EnumMsgModel.COUPON_ORDER_SHARING_ERROR.getCode()); wxMsgRecord.setReceiver(noticeContact.getPhone()); + + wxMsgRecord.setDynamicContentMap(msgReplaceMap); mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); logger.info("分账失败短信通知end"); } @@ -183,8 +188,6 @@ public class SharingOrderRedoSchedule { } String[] strings = mails.toArray(new String[mails.size()]); - Map map = new HashedMap(); - map.put("mallName", mall.getName()); MailMsg mailMsg = new MailMsg(); mailMsg.setSubject("分账失败通知"); mailMsg.setHtml(true); @@ -192,7 +195,7 @@ public class SharingOrderRedoSchedule { mailMsg.setModelType(EnumMailMsgModel.MAIL_SHARING_ERROR.getCode()); mailMsg.setTo(strings); mailMsg.updateTenantInfo(mall); - mailMsg.setDynamicContentMap(map); + mailMsg.setDynamicContentMap(msgReplaceMap); mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); logger.info("分账失败邮件通知end"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index f615b4607..7240e71cf 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -2322,12 +2322,16 @@ public class WxOrderServiceImpl implements WxOrderService { return; } String toPhone = phones.stream().collect(Collectors.joining(",")); + Map msgReplaceMap = new HashMap(); + msgReplaceMap.put("id", couponOrderReservation.getId().toString()); WxMsgRecord wxMsgRecord = new WxMsgRecord(); wxMsgRecord.updateTenantInfo(order); wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); wxMsgRecord.setModelType(EnumMsgModel.COUPON_ORDER_RESERVATION_SUCCESS.getCode()); wxMsgRecord.setReceiver(toPhone); + + wxMsgRecord.setDynamicContentMap(msgReplaceMap); mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); logger.info("订单预约短信通知end"); } diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java index 3bc02c4e2..a4d7a1521 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java @@ -60,10 +60,8 @@ public class SendEmailServiceImpl implements MsgSendService { WxMsgValidationcodeModel wxMsgModel = modelList.get(0); String msg = wxMsgModel.getContent(); - if(mailMsg.getDynamicContentMap() != null){ - for (Map.Entry entry : mailMsg.getDynamicContentMap().entrySet()) { - msg = msg.replace("{"+entry.getKey()+"}", entry.getValue()); - } + for (Map.Entry entry : mailMsg.getDynamicContentMap().entrySet()) { + msg = msg.replace("{"+entry.getKey()+"}", entry.getValue()); } if(StringUtils.isNotBlank(wxMsgModel.getEmailBgImg())){ diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java index c7dbdb341..fca924460 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java @@ -103,10 +103,8 @@ public class SendSmsServiceImpl implements MsgSendService { wxMsgValidationcode.setSignature(wxMsgValidationcodeModel.getSignature()); //替换短信内容 String msg = wxMsgValidationcodeModel.getContent(); - if(record.getDynamicContentMap() != null){ - for (Map.Entry entry : record.getDynamicContentMap().entrySet()) { - msg = msg.replace("{"+entry.getKey()+"}", entry.getValue()); - } + for (Map.Entry entry : record.getDynamicContentMap().entrySet()) { + msg = msg.replace("{"+entry.getKey()+"}", entry.getValue()); } wxMsgValidationcode.setMsg(msg);