lip пре 3 месеци
родитељ
комит
0ea1c849eb

+ 5 - 2
app/admin/command/UserTimeout.php

@@ -22,8 +22,11 @@ class UserTimeout extends Command
 
     public function execute(Input $input, Output $output)
     {
-        $config = Config::whereIn('field',['kefu_timeout_reminder','kefu_timeout_warning','user_timeouted_warning', 'user_timeout_warning','user_inline_finished'])->column('val', 'field');
-
+        $data = Config::whereIn('field',['kefu_timeout_reminder','kefu_timeout_warning','user_timeouted_warning', 'user_timeout_warning','user_inline_finished'])->field(['field','val'])->select()->toArray();
+        $config = [];
+        foreach($data as $k => $v) {
+            $config[$v['field']] = $v['val'];
+        }
         $user_timeout_warning = 0;
         if (isset($config['user_timeout_warning']) && $config['user_timeout_warning'] > 0) {
             $user_timeout_warning = $config['user_timeout_warning'];

+ 4 - 0
app/admin/controller/Admin.php

@@ -296,9 +296,13 @@ class Admin extends BaseController
         if($userInfo){
             wsSendMsg(0,'isOnline',['id'=>$userInfo['user_id'],'is_online'=>0]);
             
+            //结束客服忙碌时间
+            KefuTime::endData($this->admin_id, 1);
             //结束客服在线时间
             KefuTime::endData($this->admin_id, 2);
             
+            //结束客服接线时间
+            KefuTime::endData($this->admin_id, 3);
             //结束客服服务时间
             KefuTime::endData($this->admin_id, 4);
         }

+ 3 - 0
app/admin/controller/User.php

@@ -38,6 +38,9 @@ class User extends BaseController
                         ->limit($limit)
                         ->page($page)
                         ->select();
+            foreach($list as &$item) {
+                $item['offline_time'] = date('Y-m-d H:i:s', $item['offline_time']*1000);
+            }
         } catch (Exception $e) {
             return $this->error($e->getMessage());
         }

+ 4 - 4
app/common/controller/Pub.php

@@ -284,11 +284,11 @@ class Pub
         $user_id= (int)input('user_id');
         $is_online= (int)input('is_online',1);
         try{
-            $client_ids=Gateway::getClientIdByUid($user_id);
-            // 一个终端登录时才发送下线通知
-            if(count($client_ids)<2){
+            // $client_ids=Gateway::getClientIdByUid($user_id);
+            // // 一个终端登录时才发送下线通知
+            // if(count($client_ids)<2){
                 wsSendMsg(0,'isOnline',['id'=>$user_id,'is_online'=>$is_online]);
-            }
+            // }
         }catch(\Exception $e){
             // 未找到用户
         }