增加邮件发送容错判断

src/main/java/com/uas/ps/message/service/impl/MessageServiceImpl.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.uas.account.entity.User;
 import com.uas.account.util.AccountUtils;
 import com.uas.account.util.FlexJsonUtil;
-import com.uas.message.mail.domain.MailLog;
 import com.uas.ps.message.dao.AppDao;
 import com.uas.ps.message.dao.MessageDao;
 import com.uas.ps.message.domain.App;
@@ -233,6 +232,18 @@ public class MessageServiceImpl implements MessageService {
                 message.setRemark(String.valueOf(remark));
             }
 
+            // 邮件模板
+            Object mailTemplate = jsonObject.get("mailTemplate");
+            if (!StringUtils.isEmpty(mailTemplate)) {
+                message.setMailTemplate(String.valueOf(mailTemplate));
+            }
+
+            // 短信模板
+            Object smTemplate = jsonObject.get("smTemplate");
+            if (!StringUtils.isEmpty(mailTemplate)) {
+                message.setSmTemplate(String.valueOf(smTemplate));
+            }
+
             message.setIsRead(Constant.NO);
             message.setCreateTime(new Date());
             message.setIsSent(Constant.NO);
@@ -285,7 +296,7 @@ public class MessageServiceImpl implements MessageService {
      * @param receiver 接收人
      */
     private void sendMail(Message message, User receiver) {
-        if (receiver.getSecondUID() != null) {
+        if (message.getMailTemplate() != null && receiver.getSecondUID() != null) {
             HttpHeaders headers = new HttpHeaders();
             MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
             headers.setContentType(type);
@@ -321,13 +332,15 @@ public class MessageServiceImpl implements MessageService {
                         obj.add(receiver.getName());
                         obj.add(receiver.getName());
 
-                        User sender = AccountUtils.getUserByImId(message.getSenderUu());
-                        obj.add(sender.getName() + "("
-                            + sender.getName() + ")");
-                        sms.setParams(obj);
-                        sms.setReceiver(receiver.getUid());
-                        sms.setTemplateId(message.getSmTemplate());
-                        com.uas.ps.message.util.HttpUtil.sendPost(messageUrl, FastjsonUtils.toJson(sms));
+                        User sender = AccountUtils.getImUserByUserUU(message.getSenderUu());
+                        if (sender != null) {
+                            obj.add(sender.getName() + "("
+                                + sender.getName() + ")");
+                            sms.setParams(obj);
+                            sms.setReceiver(receiver.getUid());
+                            sms.setTemplateId(message.getSmTemplate());
+                            com.uas.ps.message.util.HttpUtil.sendPost(messageUrl, FastjsonUtils.toJson(sms));
+                        }
                     } catch (Exception e) {
                         e.printStackTrace();
                     }