update 发送邮件无发件人时,返回提示信息
This commit is contained in:
-3
@@ -101,9 +101,6 @@ public class SendMessageServiceImpl implements SendMessageService {
|
|||||||
// 1短信 2邮件 3系统
|
// 1短信 2邮件 3系统
|
||||||
// 发送邮件 true
|
// 发送邮件 true
|
||||||
String fromUser = sendMessageDTO.getFromUser();
|
String fromUser = sendMessageDTO.getFromUser();
|
||||||
if (StringUtils.isBlank(fromUser)){
|
|
||||||
fromUser = env.getProperty("message.systemEmailUser");
|
|
||||||
}
|
|
||||||
Integer sendEmailFlag = sendMessageDTO.getSendEmailFlag();
|
Integer sendEmailFlag = sendMessageDTO.getSendEmailFlag();
|
||||||
LoginUser loginUser = sysBaseAPI.getUserByName(fromUser);
|
LoginUser loginUser = sysBaseAPI.getUserByName(fromUser);
|
||||||
if(templateType.contains(ProjectCommon.MESSAGE_TYPE2) && !CommonConstant.DEL_FLAG_0.equals(sendEmailFlag)){
|
if(templateType.contains(ProjectCommon.MESSAGE_TYPE2) && !CommonConstant.DEL_FLAG_0.equals(sendEmailFlag)){
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.quartz.Job;
|
import org.quartz.Job;
|
||||||
import org.quartz.JobExecutionContext;
|
import org.quartz.JobExecutionContext;
|
||||||
import org.quartz.JobExecutionException;
|
import org.quartz.JobExecutionException;
|
||||||
|
import org.springframework.core.env.Environment;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
@@ -44,6 +45,8 @@ public class MemberProjectJob implements Job{
|
|||||||
private SendMessageService sendMessageService;
|
private SendMessageService sendMessageService;
|
||||||
@Resource
|
@Resource
|
||||||
private IPayContactsManagementService payContactsManagementService;
|
private IPayContactsManagementService payContactsManagementService;
|
||||||
|
@Resource
|
||||||
|
private Environment env;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
|
public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
|
||||||
@@ -71,7 +74,7 @@ public class MemberProjectJob implements Job{
|
|||||||
}
|
}
|
||||||
HashMap<String,String> map = new HashMap<>();
|
HashMap<String,String> map = new HashMap<>();
|
||||||
map.put("expiredDay",offset.toString(DatePattern.CHINESE_DATE_PATTERN));
|
map.put("expiredDay",offset.toString(DatePattern.CHINESE_DATE_PATTERN));
|
||||||
sendMessageDTO.setFromUser(null);
|
sendMessageDTO.setFromUser(env.getProperty("message.systemEmailUser"));
|
||||||
sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG17.getCode());
|
sendMessageDTO.setTemplateCode(ManagementMessageEnums.MSG17.getCode());
|
||||||
sendMessageDTO.setTemplateParam(map);
|
sendMessageDTO.setTemplateParam(map);
|
||||||
sendMessageService.SendMessageService(sendMessageDTO);
|
sendMessageService.SendMessageService(sendMessageDTO);
|
||||||
|
|||||||
Reference in New Issue
Block a user