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

vendor/GatewayWorker_windows/Applications/whisper/Events.php

@@ -1318,6 +1318,7 @@ class Events
         $kf_info_to = json_decode(self::$redis->hget(self::KFINFOKEY, $toukfid), true);
         $user_info = json_decode(self::$redis->hget(self::USERINFOKEY, $uid), true);
         $serviceid = intval($user_info['serverid']);
+        $data = self::$redis->hget(self::SERVICELOG, $serviceid);
 
         if (empty($kf_info_from) || empty($kf_info_to) || empty($user_info) || empty($serviceid)) {
             self::DebugOut('changeOtherhKeFu exit23...');
@@ -1335,7 +1336,7 @@ class Events
             self::DebugOut('changeOtherhKeFu exit5...');
             return false;
         }
-        self::$db->update('ws_service_log')->cols(['servicelog_close_type' => 5, 'status' => 2, 'end_time' => time()])->where("servicelog_id=$serviceid")->query();
+        //self::$db->update('ws_service_log')->cols(['servicelog_close_type' => 5, 'status' => 2, 'end_time' => time()])->where("servicelog_id=$serviceid")->query();
         self::$redis->hdel(self::SERVICELOG, $serviceid);
         unset($oldlog['servicelog_id']);
 
@@ -1357,6 +1358,30 @@ class Events
         $user_info['serverid'] = $new_id;
         self::$redis->hset(self::USERINFOKEY, $uid, json_encode($user_info, 256));
 
+
+        ///////旧工单部分数据更新回库
+        /// 查询工单会话总数.
+        $chatCount = self::$db->select('count(*) as count')->from('ws_chat_log')->where("servicelog_id=$serviceid")->row();
+        $updateServiceLogData = [
+            'status' => 2,
+            'evaluate_id' => isset($data['evaluate_id']) ? $data['evaluate_id'] : 0,
+            'evaluate_content' => isset($data['evaluate_content']) ? $data['evaluate_content'] : '',
+            'servicelog_close_type' => 5,
+            'end_time' => time(),
+        ];
+        $updataAlarmData = [
+            'alarm_userSensitive' => $data['alarm_userSensitive'],
+            'alarm_serverSensitive' => $data['alarm_serverSensitive'],
+            'alarm_corresponding' => $data['alarm_corresponding'],
+            'alarm_cvtOvertime' => time() - $data['start_time'],
+            'alarm_respond' => $data['alarm_respond'],
+            'alarm_lineTime' => $data['start_time'] - $data['intime'],
+            'alarm_count' => $chatCount['count'],
+        ];
+        self::$db->update('ws_service_log')->cols($updateServiceLogData)->where("servicelog_id=$serviceid")->query();
+        self::$db->update('ws_alarm')->cols($updataAlarmData)->where("servicelog_id=$serviceid")->query();
+        ///////////////////////////
+
         unset($kf_info_to['user_info']);
         ///通知消息发送--------------
         // 通知会员发送信息绑定客服的id