Merge branch 'dev' of http://git.bocai108.com:10180/Ethan/Customer-Service into dev

vendor/GatewayWorker_windows/Applications/whisper/Events.php

@@ -183,6 +183,9 @@ class Events
                 case 'changeOtherhKeFu';
                     self::changeOtherhKeFu($client_id, $message);
                     break;
+                case 'userlabeall':
+                    self::getUserLabAll($client_id, $message);
+                    break;
                 // 弹出评价.
                 case 'getEvaluate';
                     self::getEvaluate($message['data']);
@@ -278,7 +281,6 @@ class Events
         return;
     }
 
-
     //获取在线客服列表
     public static function getkfonlines()
     {
@@ -1129,6 +1131,7 @@ class Events
             'data' => [
                 'user_info' => $userInfo,
                 'conversationId' => $serviceid,
+                'history' => self::getServerChagLog($serviceid)
             ]
         ];
         self::MySendMsg($kfinfo['client_id'], json_encode($noticeKf, 256));
@@ -1140,6 +1143,15 @@ class Events
         return;
     }
 
+    //获取工单最后20条聊天记录
+    private static function getServerChagLog($sericeId, $limit = 20)
+    {
+        $ret = self::$db->select('from_id,from_name,to_id,to_name,content')->from('ws_chat_log')->where('servicelog_id=:sid')->bindValues(array('sid' => $sericeId))->orderByDESC(['id'])->limit($limit)->query();
+        if ($ret) {
+            rsort($ret);
+        }
+        return $ret;
+    }
 
     //用户排队数据  按组
     private static function getUserListData()
@@ -1944,6 +1956,13 @@ class Events
         }
     }
 
+    //用户重要性标签
+    private static function getUserLabAll($client_id, $message)
+    {
+        $data = self::$global->accountslabel;
+        Gateway::sendToCurrentClient(json_encode(['message_type' => 'userlabeall', 'data' => $data], 256));
+    }
+
     //调试使用
     public static function debug($dataArray)
     {