From 5a14eceb9c571b10459e74c9ab69128f10397e00 Mon Sep 17 00:00:00 2001
From: ctexthuang <ctexthuang@qq.com>
Date: Tue, 14 Jan 2025 15:01:56 +0800
Subject: [PATCH] feat: chef

---
 app/Request/Admin/ChefRequest.php        |  3 ++-
 app/Service/Admin/System/ChefService.php | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/Request/Admin/ChefRequest.php b/app/Request/Admin/ChefRequest.php
index 0c29ab6..55f25f4 100644
--- a/app/Request/Admin/ChefRequest.php
+++ b/app/Request/Admin/ChefRequest.php
@@ -29,6 +29,7 @@ class ChefRequest extends FormRequest
             'user_id' =>'required|integer|exists:chef,user_id',
             'profile' =>'sometimes',
             'specialties' =>'sometimes',
+            'query_city_id' => 'sometimes|integer|exists:city,id',
         ];
     }
 
@@ -39,7 +40,7 @@ class ChefRequest extends FormRequest
             'query_chef_id'
         ],
         'chef_detail_list' => [
-            'chef_id',
+            'query_city_id',
         ],
         'setting_chef' => [
             'user_id',
diff --git a/app/Service/Admin/System/ChefService.php b/app/Service/Admin/System/ChefService.php
index 33101fa..17cf4dd 100644
--- a/app/Service/Admin/System/ChefService.php
+++ b/app/Service/Admin/System/ChefService.php
@@ -53,17 +53,17 @@ class ChefService extends BaseService
 
     public function chefDetailList(): array
     {
-        $chefId = (int)$this->request->input('chef_id');
         $limit = (int)$this->request->input('limit', 10);
+        $cityId = (int)$this->request->input('query_city_id');
 
         $list = $this
-            ->adminUserModel
-            ->leftJoin('chef', 'admin_user.id', '=', 'chef.user_id')
+            ->chefModel
+            ->leftJoin('admin_user', 'admin_user.id', '=', 'chef.user_id')
             ->where('admin_user.is_del',UserCode::IS_NO_DEL)
             ->where('admin_user.status',UserCode::ENABLE)
             ->where('admin_user.role_id',RoleCode::CHEF)
-            ->when(!empty($chefId), function ($query) use ($chefId) {
-                $query->where('chef.id', $chefId);
+            ->when(!empty($cityId), function ($query) use ($cityId) {
+                $query->where('admin_user.city_id', $cityId);
             })
             ->paginate($limit,['chef.id','admin_user.avatar','admin_user.chinese_name','chef.profile','chef.specialties'])->toArray();