|
@@ -178,6 +178,7 @@ public class CommonServiceImpl implements ICommonService {
|
|
|
public void sendEmail(String num) {
|
|
|
try {
|
|
|
Long userId = null;
|
|
|
+ String websize = "";
|
|
|
ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
|
|
|
if(Objects.isNull(scenePlus)){
|
|
|
ScenePro scenePro = sceneProService.getByNum(num);
|
|
@@ -185,30 +186,31 @@ public class CommonServiceImpl implements ICommonService {
|
|
|
return;
|
|
|
}
|
|
|
userId = scenePro.getUserId();
|
|
|
+ websize = scenePro.getWebSite();
|
|
|
}else{
|
|
|
userId = scenePlus.getUserId();
|
|
|
+ ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
|
|
|
+ websize = scenePlusExt.getWebSite();
|
|
|
}
|
|
|
|
|
|
if(Objects.isNull(userId)){
|
|
|
return;
|
|
|
}
|
|
|
- User user = userService.getById(scenePlus.getUserId());
|
|
|
+ User user = userService.getById(userId);
|
|
|
if(Objects.isNull(user) || StrUtil.isEmpty(user.getUserName())){
|
|
|
return;
|
|
|
}
|
|
|
String toEmail = user.getUserName();
|
|
|
- ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
|
|
|
- String sceneLink = scenePlusExt.getWebSite();
|
|
|
String helpLink = helpLinkEn;
|
|
|
String lang = "en";
|
|
|
if("gn".equals(env)){
|
|
|
lang = "zh";
|
|
|
helpLink = helpLinkZh;
|
|
|
}
|
|
|
- sceneLink += "&lang=" + lang;
|
|
|
+ websize += "&lang=" + lang;
|
|
|
|
|
|
MailTemplate mailTemplate = mailTemplateService.getOne(new LambdaQueryWrapper<MailTemplate>().eq(MailTemplate::getRemark, "计算完成").eq(MailTemplate::getLang, lang));
|
|
|
- String content = mailTemplate.getMsg().replaceAll("scene_name", scenePlus.getTitle()).replaceAll("scene_link", sceneLink).replaceAll("help_link", helpLink);
|
|
|
+ String content = mailTemplate.getMsg().replaceAll("scene_name", scenePlus.getTitle()).replaceAll("scene_link", websize).replaceAll("help_link", helpLink);
|
|
|
SendMailAcceUtils.sendMail(mailTemplate.getSendMail(), mailTemplate.getSendPassword(), mailTemplate.getSendHost(), toEmail, mailTemplate.getSubject(), content, null);
|
|
|
}catch (Exception e){
|
|
|
log.warn("发送邮件失败,num:{}", num);
|