From a79f979a9a6a71121f7cf5ca2d85248ee51b6014 Mon Sep 17 00:00:00 2001 From: "LAPTOP-7SGDREK0\\shiweijun" <411582373@qq.com> Date: Mon, 17 Feb 2025 16:55:26 +0800 Subject: [PATCH] feat:material_application --- app/Service/Api/Material/MaterialService.php | 2 ++ sync/http/admin/auth.http | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/Service/Api/Material/MaterialService.php b/app/Service/Api/Material/MaterialService.php index 84f2eac..7806fbc 100644 --- a/app/Service/Api/Material/MaterialService.php +++ b/app/Service/Api/Material/MaterialService.php @@ -113,12 +113,14 @@ class MaterialService extends BaseService{ public function applicationList(): array { $limit = (int)$this->request->input('limit', 10); + $dishId = (int)$this->request->input('dish_id'); $list = $this->MaterialApplication ->leftJoin('material', 'material.id', '=', 'material_id') ->leftJoin('dish', 'dish.id', '=', 'dish_id') ->leftJoin('admin_user', 'admin_user.id', '=', 'operator_id') ->where('material_application.is_del',MaterialCode::IS_NO_DEL) ->where('material_application.operator_id', $this->userId) + ->where('material_application.dish_id', $dishId) ->paginate($limit,['material_application.*','material.name as material_name','dish.dish as dish_name','admin_user.chinese_name as operator_name']) ->toArray(); diff --git a/sync/http/admin/auth.http b/sync/http/admin/auth.http index 1925073..e77d788 100644 --- a/sync/http/admin/auth.http +++ b/sync/http/admin/auth.http @@ -445,7 +445,7 @@ Content-Type: application/x-www-form-urlencoded Authorization: Bearer {{admin_token}} ### 个人申请材料列表 -GET {{host}}/api/material/application_list?limit=10 +GET {{host}}/api/material/application_list?limit=10&dish_id=1 content-type: application/json Authorization: Bearer {{admin_token}} @@ -541,3 +541,9 @@ Content-Type: application/x-www-form-urlencoded Authorization: Bearer {{admin_token}} user_id=5&kitchen_id=1 + +### 厨师成本列表 +GET {{host}}/admin/material/chef_cost_list?limit=10&query_kitchen_id=1 +content-type: application/json +Authorization: Bearer {{admin_token}} +