From 8d5dc6ef229ea39eea403ce325aff321fccaa46f Mon Sep 17 00:00:00 2001
From: "LAPTOP-7SGDREK0\\shiweijun" <411582373@qq.com>
Date: Wed, 12 Feb 2025 14:46:22 +0800
Subject: [PATCH] feat:warehouse_keeper

---
 app/Controller/Admin/WarehouseKeeperController.php |  2 +-
 app/Request/Admin/WarehouseKeeperRequest.php       |  4 ++--
 app/Service/Admin/System/WarehouseService.php      |  2 +-
 sync/http/admin/auth.http                          | 11 +++++++++++
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/Controller/Admin/WarehouseKeeperController.php b/app/Controller/Admin/WarehouseKeeperController.php
index 0cc0bf2..f8b3818 100644
--- a/app/Controller/Admin/WarehouseKeeperController.php
+++ b/app/Controller/Admin/WarehouseKeeperController.php
@@ -20,7 +20,7 @@ use Hyperf\Validation\Annotation\Scene;
 class WarehouseKeeperController
 {
     /**
-     * 厨师详细列表
+     * 仓管详细列表
      * @param WarehouseKeeperRequest $request
      * @return array
      */
diff --git a/app/Request/Admin/WarehouseKeeperRequest.php b/app/Request/Admin/WarehouseKeeperRequest.php
index 1734000..a234c7c 100644
--- a/app/Request/Admin/WarehouseKeeperRequest.php
+++ b/app/Request/Admin/WarehouseKeeperRequest.php
@@ -31,12 +31,12 @@ class WarehouseKeeperRequest extends FormRequest
     }
 
     protected array $scenes = [
-        'warehouse_list' => [
+        'warehouse_keeper_list' => [
             'limit',
             'query_city_id',
             'query_name'
         ],
-        'setting_warehouse' => [
+        'setting_warehouse_keeper' => [
             'user_id',
             'kitchen_id',
         ],
diff --git a/app/Service/Admin/System/WarehouseService.php b/app/Service/Admin/System/WarehouseService.php
index 78e0d19..5800ed3 100644
--- a/app/Service/Admin/System/WarehouseService.php
+++ b/app/Service/Admin/System/WarehouseService.php
@@ -49,7 +49,7 @@ class WarehouseService extends BaseService{
             ->when(!empty($name), function ($query) use ($name) {
                 $query->where('admin_user.chinese_name', 'like', "$name%");
             })
-            ->paginate($limit,['warehouse_keeper.id','admin_user.avatar','admin_user.chinese_name','warehouse_keeper.kitchen_id'])->toArray();
+            ->paginate($limit,['warehouse_keeper.id','admin_user.avatar','admin_user.chinese_name','admin_user.city_id','warehouse_keeper.kitchen_id'])->toArray();
 
         if (empty($list)) return $this->return->success('success',['list' => []]);
 
diff --git a/sync/http/admin/auth.http b/sync/http/admin/auth.http
index 642e931..bfa7f7a 100644
--- a/sync/http/admin/auth.http
+++ b/sync/http/admin/auth.http
@@ -530,3 +530,14 @@ GET {{host}}/api/depot/recycle_list?limit=10&query_kitchen_id=1
 content-type: application/json
 Authorization: Bearer {{admin_token}}
 
+### 仓管详细列表
+GET {{host}}/admin/warehouse_keeper/warehouse_keeper_list?limit=10&query_city_id=1
+content-type: application/json
+Authorization: Bearer {{admin_token}}
+
+### 设置仓管数据
+POST {{host}}/admin/warehouse_keeper/setting_warehouse_keeper
+Content-Type: application/x-www-form-urlencoded
+Authorization: Bearer {{admin_token}}
+
+user_id=5&kitchen_id=1