lip před 3 měsíci
rodič
revize
cdc8af9d72
2 změnil soubory, kde provedl 22 přidání a 22 odebrání
  1. 1 1
      app/admin/command/UserTimeout.php
  2. 21 21
      app/enterprise/controller/Im.php

+ 1 - 1
app/admin/command/UserTimeout.php

@@ -83,7 +83,7 @@ class UserTimeout extends Command
                     ->select()
                     ->select()
                     ->toArray();
                     ->toArray();
             foreach($list as $user) {
             foreach($list as $user) {
-                User::where('id', $user['user_id'])->update(['service_status' => 3, 'service_start' => time()]);
+                User::where('user_id', $user['user_id'])->update(['service_status' => 3, 'service_start' => time()]);
                 KefuTime::endData($user['cs_uid'], 3); //结束接线时间
                 KefuTime::endData($user['cs_uid'], 3); //结束接线时间
                 //通知客服已结束
                 //通知客服已结束
                 wsSendMsg($user['cs_uid'],'handleChat',['user_id'=>$user['user_id']]);
                 wsSendMsg($user['cs_uid'],'handleChat',['user_id'=>$user['user_id']]);

+ 21 - 21
app/enterprise/controller/Im.php

@@ -39,9 +39,9 @@ class Im extends BaseController
                         ->page($page)
                         ->page($page)
                         ->select();
                         ->select();
         } catch (Exception $e) {
         } catch (Exception $e) {
-            return error($e->getMessage());
+            return $this->error($e->getMessage());
         }
         }
-        return success('', ['count' => $count, 'list' => $list]);
+        return $this->success(['count' => $count, 'list' => $list]);
     }
     }
 
 
     /**
     /**
@@ -51,16 +51,16 @@ class Im extends BaseController
     {
     {
         $params = $this->request->param();
         $params = $this->request->param();
         if (empty($params['complaint_item_id'])) {
         if (empty($params['complaint_item_id'])) {
-            return error('请选择投诉项');
+            return $this->error('请选择投诉项');
         }
         }
         $user_id = $this->userInfo['user_id'];
         $user_id = $this->userInfo['user_id'];
         $user = User::where('user_id', $user_id)->find();
         $user = User::where('user_id', $user_id)->find();
         if (!$user) {
         if (!$user) {
-            return error('用户不存在');
+            return $this->error('用户不存在');
         }
         }
         $exist = Complaint::where('user_id', $user_id)->where('cs_uid', $user->cs_uid)->find();
         $exist = Complaint::where('user_id', $user_id)->where('cs_uid', $user->cs_uid)->find();
         if ($exist) {
         if ($exist) {
-            return error('您已投诉过该客服,无需重复投诉');
+            return $this->error('您已投诉过该客服,无需重复投诉');
         }
         }
 
 
         Complaint::create([
         Complaint::create([
@@ -68,16 +68,16 @@ class Im extends BaseController
             'cs_uid' => $user->cs_uid,
             'cs_uid' => $user->cs_uid,
             'complaint_item_id' => $params['complaint_item_id'],
             'complaint_item_id' => $params['complaint_item_id'],
             'remark' => $params['remark'] ?? '',
             'remark' => $params['remark'] ?? '',
+            'language_code' => $this->lang,
         ]);
         ]);
         $data = $this->request->param();
         $data = $this->request->param();
         $data['user_id'] = $user['id'];
         $data['user_id'] = $user['id'];
-        $data['create_time'] = time();
         $data['status'] = 0;
         $data['status'] = 0;
         $data['type'] = 1;
         $data['type'] = 1;
-        $res = Db::name('complaint')->insert($data);
-        if ($res) {
-            return $this->success('提交成功');
-        }
+        Db::name('complaint')->insert($data);
+        
+        return $this->success('提交成功');
+        
     }
     }
 
 
     /**
     /**
@@ -106,9 +106,9 @@ class Im extends BaseController
                         ->select();
                         ->select();
             
             
         } catch (Exception $e) {
         } catch (Exception $e) {
-            return error($e->getMessage());
+            return $this->error($e->getMessage());
         }
         }
-        return success('', [ 'count' => $count, 'list' => $list]);
+        return $this->success([ 'count' => $count, 'list' => $list]);
     }
     }
 
 
     /**
     /**
@@ -124,9 +124,9 @@ class Im extends BaseController
                 $info->save();
                 $info->save();
             }
             }
         } catch (Exception $e) {
         } catch (Exception $e) {
-            return error($e->getMessage());
+            return $this->error($e->getMessage());
         }
         }
-        return success('');
+        return $this->success([]);
     }
     }
 
 
     /**
     /**
@@ -152,7 +152,7 @@ class Im extends BaseController
         } catch (Exception $e) {
         } catch (Exception $e) {
             return error($e->getMessage());
             return error($e->getMessage());
         }
         }
-        return success('', [ 'count' => $count, 'list' => $list]);
+        return $this->success([ 'count' => $count, 'list' => $list]);
     }
     }
 
 
     /**
     /**
@@ -173,9 +173,9 @@ class Im extends BaseController
                 $question->save();
                 $question->save();
             }
             }
         } catch (Exception $e) {
         } catch (Exception $e) {
-            return error($e->getMessage());
+            return $this->error($e->getMessage());
         }
         }
-        return success('');
+        return $this->success([]);
     }
     }
 
 
     /**
     /**
@@ -187,10 +187,10 @@ class Im extends BaseController
             $user_id = $this->userInfo['user_id'];
             $user_id = $this->userInfo['user_id'];
             $user = User::where('user_id', $user_id)->find();
             $user = User::where('user_id', $user_id)->find();
             if (!$user) {
             if (!$user) {
-                return error('用户不存在');
+                return $this->error('用户不存在');
             }
             }
             if ($user->role > 0) {
             if ($user->role > 0) {
-                return error('系统管理员无法转人工');
+                return $this->error('系统管理员无法转人工');
             }
             }
             // ($user->service_status == -1) {
             // ($user->service_status == -1) {
                 $user->service_status = 0;
                 $user->service_status = 0;
@@ -214,9 +214,9 @@ class Im extends BaseController
                 Message::sendMsg($param, 0);
                 Message::sendMsg($param, 0);
             //
             //
         } catch (Exception $e) {
         } catch (Exception $e) {
-            return error($e->getMessage());
+            return $this->error($e->getMessage());
         }
         }
-        return success('');
+        return $this->success([]);
     }
     }
     // 获取联系人列表
     // 获取联系人列表
     public function getContacts()
     public function getContacts()