| @@ -167,12 +167,17 @@ public class SharingOrderRedoSchedule { | |||||
| if(noticeContact == null){ | if(noticeContact == null){ | ||||
| return; | return; | ||||
| } | } | ||||
| Map<String, String> msgReplaceMap = new HashMap(); | |||||
| msgReplaceMap.put("mallName", mall.getName()); | |||||
| if(StringUtils.isNotBlank(noticeContact.getPhone()) && EnumYesOrNo.YES.getCode().equals(noticeContact.getPhoneEnabled())){ | if(StringUtils.isNotBlank(noticeContact.getPhone()) && EnumYesOrNo.YES.getCode().equals(noticeContact.getPhoneEnabled())){ | ||||
| WxMsgRecord wxMsgRecord = new WxMsgRecord(); | WxMsgRecord wxMsgRecord = new WxMsgRecord(); | ||||
| wxMsgRecord.updateTenantInfo(mall); | wxMsgRecord.updateTenantInfo(mall); | ||||
| wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); | wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); | ||||
| wxMsgRecord.setModelType(EnumMsgModel.COUPON_ORDER_SHARING_ERROR.getCode()); | wxMsgRecord.setModelType(EnumMsgModel.COUPON_ORDER_SHARING_ERROR.getCode()); | ||||
| wxMsgRecord.setReceiver(noticeContact.getPhone()); | wxMsgRecord.setReceiver(noticeContact.getPhone()); | ||||
| wxMsgRecord.setDynamicContentMap(msgReplaceMap); | |||||
| mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); | mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); | ||||
| logger.info("分账失败短信通知end"); | logger.info("分账失败短信通知end"); | ||||
| } | } | ||||
| @@ -183,8 +188,6 @@ public class SharingOrderRedoSchedule { | |||||
| } | } | ||||
| String[] strings = mails.toArray(new String[mails.size()]); | String[] strings = mails.toArray(new String[mails.size()]); | ||||
| Map<String, String> map = new HashedMap(); | |||||
| map.put("mallName", mall.getName()); | |||||
| MailMsg mailMsg = new MailMsg(); | MailMsg mailMsg = new MailMsg(); | ||||
| mailMsg.setSubject("分账失败通知"); | mailMsg.setSubject("分账失败通知"); | ||||
| mailMsg.setHtml(true); | mailMsg.setHtml(true); | ||||
| @@ -192,7 +195,7 @@ public class SharingOrderRedoSchedule { | |||||
| mailMsg.setModelType(EnumMailMsgModel.MAIL_SHARING_ERROR.getCode()); | mailMsg.setModelType(EnumMailMsgModel.MAIL_SHARING_ERROR.getCode()); | ||||
| mailMsg.setTo(strings); | mailMsg.setTo(strings); | ||||
| mailMsg.updateTenantInfo(mall); | mailMsg.updateTenantInfo(mall); | ||||
| mailMsg.setDynamicContentMap(map); | |||||
| mailMsg.setDynamicContentMap(msgReplaceMap); | |||||
| mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); | mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); | ||||
| logger.info("分账失败邮件通知end"); | logger.info("分账失败邮件通知end"); | ||||
| @@ -2322,12 +2322,16 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| return; | return; | ||||
| } | } | ||||
| String toPhone = phones.stream().collect(Collectors.joining(",")); | String toPhone = phones.stream().collect(Collectors.joining(",")); | ||||
| Map<String, String> msgReplaceMap = new HashMap(); | |||||
| msgReplaceMap.put("id", couponOrderReservation.getId().toString()); | |||||
| WxMsgRecord wxMsgRecord = new WxMsgRecord(); | WxMsgRecord wxMsgRecord = new WxMsgRecord(); | ||||
| wxMsgRecord.updateTenantInfo(order); | wxMsgRecord.updateTenantInfo(order); | ||||
| wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); | wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); | ||||
| wxMsgRecord.setModelType(EnumMsgModel.COUPON_ORDER_RESERVATION_SUCCESS.getCode()); | wxMsgRecord.setModelType(EnumMsgModel.COUPON_ORDER_RESERVATION_SUCCESS.getCode()); | ||||
| wxMsgRecord.setReceiver(toPhone); | wxMsgRecord.setReceiver(toPhone); | ||||
| wxMsgRecord.setDynamicContentMap(msgReplaceMap); | |||||
| mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); | mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); | ||||
| logger.info("订单预约短信通知end"); | logger.info("订单预约短信通知end"); | ||||
| } | } | ||||
| @@ -60,10 +60,8 @@ public class SendEmailServiceImpl implements MsgSendService { | |||||
| WxMsgValidationcodeModel wxMsgModel = modelList.get(0); | WxMsgValidationcodeModel wxMsgModel = modelList.get(0); | ||||
| String msg = wxMsgModel.getContent(); | String msg = wxMsgModel.getContent(); | ||||
| if(mailMsg.getDynamicContentMap() != null){ | |||||
| for (Map.Entry<String, String> entry : mailMsg.getDynamicContentMap().entrySet()) { | |||||
| msg = msg.replace("{"+entry.getKey()+"}", entry.getValue()); | |||||
| } | |||||
| for (Map.Entry<String, String> entry : mailMsg.getDynamicContentMap().entrySet()) { | |||||
| msg = msg.replace("{"+entry.getKey()+"}", entry.getValue()); | |||||
| } | } | ||||
| if(StringUtils.isNotBlank(wxMsgModel.getEmailBgImg())){ | if(StringUtils.isNotBlank(wxMsgModel.getEmailBgImg())){ | ||||
| @@ -103,10 +103,8 @@ public class SendSmsServiceImpl implements MsgSendService { | |||||
| wxMsgValidationcode.setSignature(wxMsgValidationcodeModel.getSignature()); | wxMsgValidationcode.setSignature(wxMsgValidationcodeModel.getSignature()); | ||||
| //替换短信内容 | //替换短信内容 | ||||
| String msg = wxMsgValidationcodeModel.getContent(); | String msg = wxMsgValidationcodeModel.getContent(); | ||||
| if(record.getDynamicContentMap() != null){ | |||||
| for (Map.Entry<String, String> entry : record.getDynamicContentMap().entrySet()) { | |||||
| msg = msg.replace("{"+entry.getKey()+"}", entry.getValue()); | |||||
| } | |||||
| for (Map.Entry<String, String> entry : record.getDynamicContentMap().entrySet()) { | |||||
| msg = msg.replace("{"+entry.getKey()+"}", entry.getValue()); | |||||
| } | } | ||||
| wxMsgValidationcode.setMsg(msg); | wxMsgValidationcode.setMsg(msg); | ||||