修改公共询价发送短信功能

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

@@ -1,6 +1,5 @@
 package com.uas.ps.message.service.impl;
 
-import com.alibaba.druid.stat.TableStat.Mode;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.account.entity.User;
 import com.uas.account.entity.UserView;
@@ -70,6 +69,8 @@ public class MessageServiceImpl implements MessageService {
 //    private static final String TEL_REGEXP = "^((\\(\\d{3}\\))|(\\d{3}\\-))?(13|15|18|17)\\d{9}$";
 
     private static final String PROD_URL = "http://113.105.74.140:8092/tigase/baiduPush";
+
+    private static final String SM_UU_URL= "?pagekind=B&id=%s&uu=%s";
     /**
      * 邮件服务主机地址
      */
@@ -413,6 +414,7 @@ public class MessageServiceImpl implements MessageService {
                         message.getReceiverEnuu());
                     if (receiver.getName() != null) {
                         logger.info("接收人：" + receiver.getName());
+                        message.setReceiver(FastjsonUtils.toJson(receiver));
                         // 发送邮件
 //                    if (message.getSmsType().contains(SMSType.MAIL)) {
 //                        sendMail(message, receiver);
@@ -479,21 +481,29 @@ public class MessageServiceImpl implements MessageService {
             try {
                 SmsMessage sms = new SmsMessage();
                 List<Object> obj = new ArrayList<Object>();
-                obj.add(receiver.getName());
 
                 UserView sender = AccountUtils.getImUserByUserUU(message.getSenderUu(), message.getSenderEnuu());
 
                 if (sender != null && sender.getName() != null && sender.getSpaceName() != null) {
                         logger.info("发送人：" + sender.getName());
-                        obj.add(sender.getSpaceName());
-                        obj.add(message.getRemark());
-                        sms.setParams(obj);
-                        sms.setReceiver(receiver.getUid());
-                        sms.setTemplateId(message.getSmTemplate());
-                        String response = com.uas.ps.message.util.HttpUtil
-                            .sendPost(messageUrl, FastjsonUtils.toJson(sms));
-                        logger.info("发送短信：" + response);
-                        message.setIsSent(Constant.YES);
+                    switch (message.getSmTemplate()) {
+                        // 公共询价单，普通短信
+                        case "e14d502a-25b8-40a0-8acf-5c61ae38d763" :
+                            obj.add(receiver.getName());
+                            obj.add(sender.getSpaceName());
+                            obj.add(message.getRemark());
+                            pushSm(sms, message, obj, receiver, sender);
+                            break;
+                        // 公共询价单，UU互联
+                        case "6e094dcf-f2c7-462a-9686-b2d32d684a78" :
+                            obj.add(message.getSourceId());
+                            obj.add(message.getReceiverEnuu());
+                            obj.add(receiver.getUid());
+                            pushSm(sms, message, obj, receiver, sender);
+                            break;
+                        default:
+                            break;
+                    }
                 } else {
                     logger.info("发送人信息为空，uu:" + message.getSenderUu() + ",enuu:" + message.getSenderEnuu());
                 }
@@ -504,6 +514,25 @@ public class MessageServiceImpl implements MessageService {
         }
     }
 
+    /**
+     * 调用短信接口
+     * @param sms 短信model
+     * @param message 消息
+     * @param param 短信参数
+     * @param receiver 接收人
+     * @param sender 发送人
+     */
+    private void pushSm(SmsMessage sms, Message message, List<Object> param, UserView receiver, UserView sender) {
+        sms.setParams(param);
+        sms.setReceiver(receiver.getUid());
+        sms.setTemplateId(message.getSmTemplate());
+        String response = com.uas.ps.message.util.HttpUtil
+            .sendPost(messageUrl, FastjsonUtils.toJson(sms));
+        logger.info("发送短信：" + response);
+        message.setIsSent(Constant.YES);
+        message.setSender(FastjsonUtils.toJson(sender));
+    }
+
     /**
      * 发送IM
      * @param message 消息