发送邮件逻辑优化,邮件标题支持模版参数

This commit is contained in:
杨文 2023-05-19 11:08:56 +08:00
parent 12d6c14b1c
commit e25099a49e

View File

@ -89,13 +89,14 @@ public class MailSendServiceImpl implements MailSendService {
// 创建发送日志如果模板被禁用则不发送短信只记录日志 // 创建发送日志如果模板被禁用则不发送短信只记录日志
Boolean isSend = CommonStatusEnum.ENABLE.getStatus().equals(template.getStatus()); Boolean isSend = CommonStatusEnum.ENABLE.getStatus().equals(template.getStatus());
String title = mailTemplateService.formatMailTemplateContent(template.getTitle(), templateParams);
String content = mailTemplateService.formatMailTemplateContent(template.getContent(), templateParams); String content = mailTemplateService.formatMailTemplateContent(template.getContent(), templateParams);
Long sendLogId = mailLogService.createMailLog(userId, userType, mail, Long sendLogId = mailLogService.createMailLog(userId, userType, mail,
account, template, content, templateParams, isSend); account, template, content, templateParams, isSend);
// 发送 MQ 消息异步执行发送短信 // 发送 MQ 消息异步执行发送短信
if (isSend) { if (isSend) {
mailProducer.sendMailSendMessage(sendLogId, mail, account.getId(), mailProducer.sendMailSendMessage(sendLogId, mail, account.getId(),
template.getNickname(), template.getTitle(), content); template.getNickname(), title, content);
} }
return sendLogId; return sendLogId;
} }