diff --git a/app/home/controller/News.php b/app/home/controller/News.php index 6672e571..9a4f5dc5 100644 --- a/app/home/controller/News.php +++ b/app/home/controller/News.php @@ -2,6 +2,7 @@ namespace app\home\controller; +use app\model\AdminModel; use app\model\EmailTemplateModel; use app\model\PurchaseVipModel; use app\model\UserChatLinkModel; @@ -98,12 +99,14 @@ class News extends HomeBaseController */ public function testApi() { + $customerIds = AdminModel::getCustomerIdsByAgentId(18); $uniq = bin2hex(random_bytes(16)); return json([ 'code' => '0', 'message' => lang('parameter_error'), 'data' => [ 'random' => $uniq, + 'customerIds' => $customerIds ], ]); } diff --git a/app/home/route/app.php b/app/home/route/app.php index 89477427..d3e53857 100644 --- a/app/home/route/app.php +++ b/app/home/route/app.php @@ -299,7 +299,7 @@ Route::group('/',function (){ Route::post('get_ip', 'Login/getIP'); Route::get('get_news', 'News/index'); - Route::post('test', 'News/testApi')->middleware(\app\home\middleware\AuthMiddleware::class); + Route::post('test', 'News/testApi'); Route::post('test_api', 'Document/informationArticleList'); diff --git a/app/home/service/BaseHomeService.php b/app/home/service/BaseHomeService.php index 65039128..3e78a445 100644 --- a/app/home/service/BaseHomeService.php +++ b/app/home/service/BaseHomeService.php @@ -108,6 +108,10 @@ 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 diff --git a/app/home/service/LoginService.php b/app/home/service/LoginService.php index 873d3875..a8890e16 100644 --- a/app/home/service/LoginService.php +++ b/app/home/service/LoginService.php @@ -585,7 +585,9 @@ class LoginService extends BaseHomeService ]); // 如果有代理,绑定到代理下一个客服(轮询客服绑定) if ($agentId > 0 ) { + Log::info("手机号注册 - 开始获取客服列表..."); $customerIds = AdminModel::getCustomerIdsByAgentId($agentId); // 获取代理下的所有客服ID + Log::info("手机号注册 - 获取客服列表结果==".json_encode($customerIds)); if (empty($customerIds)) { return $this->toData('500', lang('account_registration_failed')); } @@ -599,6 +601,7 @@ class LoginService extends BaseHomeService $tagIndex = $counterIndex % count($customerIds); $tagCustomerId = $customerIds[$tagIndex]; } + Log::info("手机号注册 - 或者最终绑定客服ID==".$tagCustomerId); if ($tagCustomerId > 0) { $regUser->customer_id = $tagCustomerId; $regUser->save(); diff --git a/app/model/AdminModel.php b/app/model/AdminModel.php index 660f10a6..85a86ee3 100644 --- a/app/model/AdminModel.php +++ b/app/model/AdminModel.php @@ -87,7 +87,11 @@ class AdminModel extends BaseModel if (empty($role)) { return 0; } - return $role->id; + $agentId = self::where('role_id', $role->id)->find(); + if (empty($agentId)) { + return 0; + } + return $agentId->id; } // 根据代理ID获取其下属的所有客服ID (账号关系:代理 - 总监 - 组长 - 客服)