提交

app/admin/controller/Complaint.php

@@ -26,7 +26,7 @@ class Complaint extends BaseController
             $language_code = $params['language_code'] ?? $this->lang;
             
             $query = ComplaintModel::alias('complaint')
-                                    ->join('user', 'user.uid=complaint.cs_uid','left')
+                                    ->join('user', 'user.user_id=complaint.cs_uid','left')
                                     ->where('complaint.language_code', $language_code);
             if (!empty($params['keyword'])) {
                 $query = $query->where('user.realname', 'like', '%'.$params['keyword'].'%')

app/common/listener/UserRegister.php

@@ -32,6 +32,8 @@ class UserRegister
                     // 设置双方为好友
                     Friend::create(['create_user'=>$data['user_id'],'friend_user_id'=>$autoTask['user_id'],'status'=>1]);
                     Friend::create(['create_user'=>$autoTask['user_id'],'friend_user_id'=>$data['user_id'],'status'=>1]);
+
+                    KefuLog::addData($autoTask['user_id'], $data['user_id'], 3);
                     // 如果设置了欢迎语则发送欢迎语
                     if($autoAdduser['welcome'] ?? ''){
                         $userInfo=$user->field('user_id,realname,avatar')->where(['user_id'=>$autoTask['user_id']])->find();

app/enterprise/controller/Im.php

@@ -15,6 +15,7 @@ use app\admin\model\QuestionLanguages;
 use app\admin\model\Complaint;
 use app\admin\model\ComplaintItem;
 use app\admin\model\Score;
+use think\facade\Lang;
 
 class Im extends BaseController
 {
@@ -268,9 +269,9 @@ class Im extends BaseController
         $this->userInfo['cs_uid'] = User::where('user_id', $this->userInfo['user_id'])->value('cs_uid');
 
        $map = [['status', '=', 1], ['user_id', '<>', $this->userInfo['user_id']]];
-    //    if ($this->userInfo['role'] != 0) {
-    //        $map[] = ['service_status', '<>', -1];
-    //    }
+    //   if ($this->userInfo['role'] != 0) {
+    //       $map[] = ['service_status', '<>', -1];
+    //   }
         $data = User::getUserList($this->userInfo, $map, $this->userInfo['user_id'] , '', $this->userInfo['role']);
         $count=Friend::where(['status'=>2,'friend_user_id'=>$this->uid])->count();
         $time=Friend::where(['friend_user_id'=>$this->uid,'is_invite'=>1])->order('create_time desc')->value('create_time');
@@ -810,6 +811,18 @@ class Im extends BaseController
     // 撤回消息
     public function undoMessage()
     {
+//         echo Lang::getLangSet();
+// echo \think\facade\Lang::get('ok');
+// echo \think\facade\Lang::get('im.other');
+// die;
+// Lang::clear();
+// $setRes = Lang::setLangSet('en');
+// dump('设置语言是否成功：', $setRes); // 应返回 true
+// dump('当前语言标识：', Lang::getLangSet()); // 应返回 en
+// dump('已加载的语言文件：', Lang::getLoadFiles()); // 应包含 en.php 路径
+// dump('im.other 值：', Lang::get('im.other')); // 看实际返回值
+// die;
+
         $param = $this->request->param();
         $id = $param['id'];
         $message = Message::where(['id' => $id])->find();