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

vendor/GatewayWorker_windows/Applications/whisper/Events.php

@@ -427,7 +427,7 @@ class Events
 
 
     /**
-     * 管理员
+     * 管理员登陆验证
      * @param $client_id 服务ID
      * @param $message 数据
      */
@@ -496,9 +496,10 @@ class Events
             Gateway::closeCurrentClient();
             return;
         }
+        $last = self::UserHasOldTalk($uid);
 
         $onlinekf = self::getOnlineKfData($group, 1);
-        if (empty($onlinekf)) {
+        if (empty($onlinekf)&&empty($last)) {
             Gateway::sendToClient($client_id, json_encode(['message_type' => 'notice', 'content' => '暂时没有客服上班,请稍后再咨询。'], 256));
             //Gateway::closeClient($client_id);
             return;
@@ -535,7 +536,7 @@ class Events
         $_SESSION['uid'] = $message['uid'];
 
         // 尝试分配新会员进入服务
-        self::userOnlineTask($group, $uid);
+        self::userOnlineTask($group, $uid, $last, $client_id);
     }
 
     /**
@@ -574,6 +575,7 @@ class Events
     {
         $group = $_SESSION['group'];
         $uinfo = self::$redis->hget(self::KFINFOKEY, $uid);
+        self::$redis->hdel(self::KFINFOKEY, $uid);
         $uinfo = json_decode($uinfo, true);
         if (empty($uinfo)) {
             echo "客服发生异常退出\n";
@@ -602,8 +604,6 @@ class Events
         self::$db->update('ws_users')->cols(array('online_status' => 0, 'online_connectid' => ''))->where('id=' . $kfid)->query();
         self::writeLogKfStatus($uid, 0);
 
-        self::$redis->hdel(self::KFINFOKEY, $uid);
-
         return;
     }
 
@@ -630,9 +630,9 @@ class Events
             if (!empty($kfinfo)) {
                 $kfinfoArr = json_decode($kfinfo, true);
                 $krclient_id = $kfinfoArr['client_id'];
-                $kfinfoArr['user_info'] = self::ArrayDataopt($kfinfoArr['user_info'], $client_id, 0);
+                /*$kfinfoArr['user_info'] = self::ArrayDataopt($kfinfoArr['user_info'], $client_id, 0);
                 $kfinfoArr['task'] = count($kfinfoArr['user_info']);
-                self::$redis->hset(self::KFINFOKEY, $info['kfuid'], json_encode($kfinfoArr, 256));
+                self::$redis->hset(self::KFINFOKEY, $info['kfuid'], json_encode($kfinfoArr, 256));*/
             }
         }
 
@@ -683,8 +683,11 @@ class Events
         if (empty($data)) {
             return;
         }
-        // 获取当前工单数据.
+        // 获取当前客服.
         $kfInfo = json_decode(self::$redis->HGET('KFINFO', 'KF' . $data['kf_id']), true);
+        if (empty($kfInfo)) {
+            return;
+        }
         // 删除当前工单.
         self::$redis->hdel('SERVICELOG', $servicelogId);
         // 当前服务客服删除当前人员.
@@ -792,7 +795,7 @@ class Events
      * @param $group
      * @param $uid
      */
-    private static function userOnlineTask($group = 0, $uid = 0)
+    private static function userOnlineTask($group = 0, $uid = 0, $last=[], $client_id='')
     {
         $allusergkarr = self::getUserListData();
         if (empty($allusergkarr)) {
@@ -810,9 +813,15 @@ class Events
         if ($group && $uid) {
             // 指定用指定组 [可能存在断线重连的情况] 如果存在旧的会话，直接连线客服和用户
             //否则按先到后到以及客服最大服务数限制
-            $last = self::UserHasOldTalk($uid);
-            if ($last) {print_r(time());
+            if ($last) {
                 self::BeginTalk(self::getkfuid($last['kf_id']), $uid, $last['group_id'], $last['servicelog_id']);
+                $toOld_message = [
+                    'message_type' => 'toOld',
+                    'data' => [
+                        'content' => '接入至未结束的会话'
+                    ]
+                ];
+                Gateway::sendToCurrentClient(json_encode($toOld_message, 256));
                 return;
             } else {
                 //系统定时调用时，无组，无用户
@@ -947,6 +956,61 @@ class Events
         return;
     }
 
+    //连接至上一个会话
+    private static function BeginOldTalk($kfuid, $uid, $group, $serviceid = 0, $userInfo = false)
+    {
+        $serviceid = intval($serviceid);
+        $userInfo = json_decode(self::$redis->hget(self::USERINFOKEY, $uid), true);
+        $kfinfo = json_decode(self::$redis->hget(self::KFINFOKEY, $kfuid), true);
+        if (empty($userInfo) || empty($kfinfo)) {
+            return false;
+        }
+        // 获取旧工单信息.
+        $data = json_decode(self::$redis->HGET('SERVICELOG', $last['servicelog_id']), true);
+        // 修改工单数据.
+        $data['user_avatar'] = $userInfo['avatar'];
+        $data['client_id'] = $userInfo['client_id'];
+        $data['user_ip'] = $userInfo['ip'];
+        $data['website'] = $userInfo['website'];
+        $data['system'] = $userInfo['system'];
+        $data['browse'] = $userInfo['browse'];
+        $data['status'] = $userInfo['status'];
+        self::$redis->hset(self::SERVICELOG, $serviceid, json_encode($data, 256));
+
+        // 更改用户连接客服信息
+        $userInfo['serverid'] = $serviceid;
+        $userInfo['kfuid'] = $kfuid;
+        self::$redis->hset(self::USERINFOKEY, $uid, json_encode($userInfo, 256));
+
+        // 通知会员发送信息绑定客服的id
+        $noticeUser = [
+            'message_type' => 'connect',
+            'data' => [
+                'kf_id' => $kfuid,
+                'conversationId' => $serviceid,
+                'serverInfo' => $kfinfo,
+                'kf_name' => $kfinfo['job_name']
+            ]
+        ];
+        self::MySendMsg($userInfo['client_id'], json_encode($noticeUser, 256));
+
+        // 发送给客服用户信息.
+        $noticeKf = [
+            'message_type' => 'connect',
+            'data' => [
+                'user_info' => $userInfo,
+                'conversationId' => $serviceid,
+            ]
+        ];
+        self::MySendMsg($kfinfo['client_id'], json_encode($noticeKf, 256));
+        unset($noticeKf);
+
+        $key = date('Ymd') . 'success_in';
+        self::$global->increment($key);
+
+        return;
+    }
+
 
     //用户排队数据  按组
     private static function getUserListData()
@@ -1459,6 +1523,7 @@ class Events
             self::$redis->del(self::USERINFOKEY);
             self::$redis->del('adminList');
             self::$redis->del(self::WEBSOCKALLUSER);
+            self::$redis->del('SERVICELOG');
             self::$db->query("update ws_service_log set status=2,end_time=$now where  start_time>=$t and  status!=2");
         }