up

app/admin/service/AdminService.php

@@ -172,12 +172,16 @@ class AdminService extends AdminBaseService
                 return $this->toData('100403', 'Please log in first', []);
             }
             $info = AdminModel::find($userId);
-
             if (empty($info)) {
                 return $this->toData('100400', 'The user does not exist.', []);
             }
             $infoArr = $info->toArray();
-
+            // 获取账号的角色信息
+            $role = AuthRoleModel::where('id', $infoArr['role_id'])->find();
+            if (empty($role)) {
+                return $this->toData('500', '该账号对应的角色信息为空');
+            }
+            $infoArr['role_name'] = $role->name;
             // 获取用户的聊天账号信息
             $chatInfo = UserChatLinkModel::where(['user_id'=>$userId, 'user_type'=>UserChatLinkModel::USER_CHAT_LINK_USER_TYPE_ADMIN])->find();
             $chat_uuid = 0;
@@ -488,7 +492,7 @@ class AdminService extends AdminBaseService
             if (empty($param['translator_id'])) {
                 return $this->toData('400', '缺少翻译员参数');
             }
-            if (empty($param['customer_id_list']) || !is_array($param['customer_id_list'])) {
+            if (empty($param['customer_id']) || !is_array($param['customer_id'])) {
                 return $this->toData('400', '缺少客服参数');
             }
 
@@ -503,7 +507,7 @@ class AdminService extends AdminBaseService
                 return $this->toData('500', 'The chat group is error.');
             }
 
-            foreach ($param['customer_id_list'] as $customerId) {
+            foreach ($param['customer_id'] as $customerId) {
                 // 记录好友关系
                 $translatorCustomer = TranslatorCustomerModel::where(['translator_id'=>$param['translator_id'], 'customer_id'=>$customerId])->find();
                 if (empty($translatorCustomer)) {

app/home/service/BaseHomeService.php

@@ -108,10 +108,6 @@ class BaseHomeService
     public function getUniqUserNo(): string
     {
         $userNoData = UserNoModel::create(['created_time'=>date("Y-m-d H:i:s")]);
-        // P2要求序列号10000开始
-        if ($userNoData->id < 10000) {
-            $userNoData = UserNoModel::create(['id'=>10000,'created_time'=>date("Y-m-d H:i:s")]);
-        }
         return 's'.$userNoData->id;
 //        $code = 's';
 //        $code .= date('ymd'); // s230629