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

application/service/controller/History.php

@@ -237,7 +237,12 @@ class History extends Common
             }
 
             $service_log = db('service_log')->where('servicelog_id',$servicelogId)->find();
-            $account = db('accounts')->field('id,account_name,nick_name,account_email,account_phone,address,remark')->where('id',$service_log['user_id'])->find();
+            $account = db('accounts')
+                ->alias('a')
+                ->join('accountslabel b', 'a.label_id = b.id')
+                ->field('a.id,account_name,nick_name,account_email,account_phone,address,remark,name as label')
+                ->where('a.id',$service_log['user_id'])
+                ->find();
             $account['user_ip'] = $service_log['user_ip'];
             $account['system'] = $service_log['system'];
             $account['browse'] = $service_log['browse'];

vendor/GatewayWorker_windows/Applications/whisper/Events.php

@@ -195,11 +195,36 @@ class Events
                 case 'debug':
                     self::debug($message['data']);
                     break;
+                case 'cancelqueue':
+                    self::cancelqueue($message['data']);
+                    break;
             }
         }
         return true;
     }
 
+    //用户取消排队
+    public function cancelqueue($messageArray)
+    {
+        $uid = intval($messageArray['uid']);
+        if (empty($uid)) {
+            return false;
+        }
+        $sessionuid = intval($_SESSION['uid']);
+        if ($sessionuid != $uid) {
+            return false;
+        }
+        $listu = self::$redis->hget(self::USERLIST, $uid);
+        if ($listu) {
+            self::$redis->hdel(self::USERLIST, $uid);
+            Gateway::sendToCurrentClient(json_encode(['message_type' => 'cancelqueueret', 'data' => ['flag' => 1, 'msg' => '取消排队成功!']], 256));
+            return;
+        } else {
+            Gateway::sendToCurrentClient(json_encode(['message_type' => 'cancelqueueret', 'data' => ['flag' => 0, 'msg' => '取消排队失败!']], 256));
+        }
+        return;
+    }
+
     // 弹出评价.
     public static function getEvaluate($message)
     {
@@ -408,6 +433,7 @@ class Events
         self::$redis->expire('loginTmp:' . $uid, 5);
         self::$redis->hset(self::KFRELONINFLAG, $uid, time());
 
+
         $newinfo =
             [
                 'id' => 'KF' . $kfinfo['id'],
@@ -415,6 +441,7 @@ class Events
                 'job_name' => $kfinfo['user_job_number'],
                 'avatar' => $kfinfo['user_avatar'],
                 'group' => $group,
+                'groupname' => self::$global->groupmap[$group],
                 'client_id' => $client_id,
                 'task' => 0,
                 'intime' => time(),