Browse Source

//..notice

release_toaliyun_real
xhxu 2 years ago
parent
commit
deae854e35
4 changed files with 14 additions and 11 deletions
  1. +6
    -3
      mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  3. +2
    -4
      mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java
  4. +2
    -4
      mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java

+ 6
- 3
mallinkSchedule/src/main/java/com/iformall/schedule/SharingOrderRedoSchedule.java View File

@@ -167,12 +167,17 @@ public class SharingOrderRedoSchedule {
if(noticeContact == null){
return;
}
Map<String, String> 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<String, String> 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");



+ 4
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java View File

@@ -2322,12 +2322,16 @@ public class WxOrderServiceImpl implements WxOrderService {
return;
}
String toPhone = phones.stream().collect(Collectors.joining(","));
Map<String, String> 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");
}


+ 2
- 4
mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java View File

@@ -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<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())){


+ 2
- 4
mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java View File

@@ -103,10 +103,8 @@ public class SendSmsServiceImpl implements MsgSendService {
wxMsgValidationcode.setSignature(wxMsgValidationcodeModel.getSignature());
//替换短信内容
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);


Loading…
Cancel
Save