From 63c3574c5fcb40451ef2a191aa9d7d18c8decc6b Mon Sep 17 00:00:00 2001 From: "LAPTOP-7SGDREK0\\shiweijun" <411582373@qq.com> Date: Wed, 22 Jan 2025 11:19:10 +0800 Subject: [PATCH] feat:material --- .../{Admin => Common}/MaterialCode.php | 2 +- app/Controller/Admin/MaterialController.php | 8 ++-- app/Controller/Api/MaterialController.php | 34 ++++++++++++++ app/Model/Material.php | 2 +- app/Model/MaterialCategory.php | 2 +- app/Request/Admin/MaterialRequest.php | 8 ++-- app/Request/Api/MaterialRequest.php | 33 ++++++++++++++ .../Material/MaterialCategoryService.php | 2 +- .../Admin/Material/MaterialService.php | 2 +- app/Service/Api/Material/MaterialService.php | 44 +++++++++++++++++++ 10 files changed, 124 insertions(+), 13 deletions(-) rename app/Constants/{Admin => Common}/MaterialCode.php (92%) create mode 100644 app/Controller/Api/MaterialController.php create mode 100644 app/Request/Api/MaterialRequest.php create mode 100644 app/Service/Api/Material/MaterialService.php diff --git a/app/Constants/Admin/MaterialCode.php b/app/Constants/Common/MaterialCode.php similarity index 92% rename from app/Constants/Admin/MaterialCode.php rename to app/Constants/Common/MaterialCode.php index 6e590be..19f519c 100644 --- a/app/Constants/Admin/MaterialCode.php +++ b/app/Constants/Common/MaterialCode.php @@ -1,6 +1,6 @@ materialList(); @@ -36,7 +36,7 @@ class MaterialController * @return array */ #[RequestMapping(path: "add", methods: "POST")] - #[Scene(scene: "add")] + #[Scene(scene: "material_add")] public function add(MaterialRequest $request): array { return (new MaterialService)->add(); @@ -48,7 +48,7 @@ class MaterialController * @return array */ #[RequestMapping(path: "delete", methods: "GET")] - #[Scene(scene: "delete")] + #[Scene(scene: "material_delete")] public function delete(MaterialRequest $request): array { return (new MaterialService())->delete(); @@ -60,7 +60,7 @@ class MaterialController * @return array */ #[RequestMapping(path: "edit", methods: "POST")] - #[Scene(scene: "edit")] + #[Scene(scene: "material_edit")] public function edit(MaterialRequest $request): array { return (new MaterialService())->edit(); diff --git a/app/Controller/Api/MaterialController.php b/app/Controller/Api/MaterialController.php new file mode 100644 index 0000000..7e96aba --- /dev/null +++ b/app/Controller/Api/MaterialController.php @@ -0,0 +1,34 @@ +materialList(); + } + + +} diff --git a/app/Model/Material.php b/app/Model/Material.php index 4de7a8c..2c687fa 100644 --- a/app/Model/Material.php +++ b/app/Model/Material.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace App\Model; -use App\Constants\Admin\MaterialCode; +use App\Constants\Common\MaterialCode; use Hyperf\Database\Model\Builder; use Hyperf\DbConnection\Model\Model; diff --git a/app/Model/MaterialCategory.php b/app/Model/MaterialCategory.php index d66f725..b68aa0d 100644 --- a/app/Model/MaterialCategory.php +++ b/app/Model/MaterialCategory.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace App\Model; -use App\Constants\Admin\MaterialCode; +use App\Constants\Common\MaterialCode; use Hyperf\Database\Model\Builder; use Hyperf\DbConnection\Model\Model; diff --git a/app/Request/Admin/MaterialRequest.php b/app/Request/Admin/MaterialRequest.php index e81dcf2..b3ef04c 100644 --- a/app/Request/Admin/MaterialRequest.php +++ b/app/Request/Admin/MaterialRequest.php @@ -36,9 +36,9 @@ class MaterialRequest extends FormRequest } protected array $scenes = [ - 'list' => ['limit','query_name'], - 'add' => ['category_id', 'name', 'standard', 'unit', 'bar_code', 'city_id', 'kitchen_id'], - 'edit' => ['id','category_id', 'name', 'standard', 'unit', 'bar_code','status'], - 'delete' => ['id'], + 'material_list' => ['limit','query_name'], + 'material_add' => ['category_id', 'name', 'standard', 'unit', 'bar_code', 'city_id', 'kitchen_id'], + 'material_edit' => ['id','category_id', 'name', 'standard', 'unit', 'bar_code','status'], + 'material_delete' => ['id'], ]; } diff --git a/app/Request/Api/MaterialRequest.php b/app/Request/Api/MaterialRequest.php new file mode 100644 index 0000000..124b738 --- /dev/null +++ b/app/Request/Api/MaterialRequest.php @@ -0,0 +1,33 @@ + 'required|integer', + 'query_name' =>'sometimes|string', + ]; + } + + protected array $scenes = [ + 'material_list' => ['limit','query_name'], + ]; +} diff --git a/app/Service/Admin/Material/MaterialCategoryService.php b/app/Service/Admin/Material/MaterialCategoryService.php index c18b684..09271f3 100644 --- a/app/Service/Admin/Material/MaterialCategoryService.php +++ b/app/Service/Admin/Material/MaterialCategoryService.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace App\Service\Admin\Material; -use App\Constants\Admin\MaterialCode; +use App\Constants\Common\MaterialCode; use App\Exception\ErrException; use App\Model\MaterialCategory; use App\Service\Admin\BaseService; diff --git a/app/Service/Admin/Material/MaterialService.php b/app/Service/Admin/Material/MaterialService.php index 62564b9..fc19240 100644 --- a/app/Service/Admin/Material/MaterialService.php +++ b/app/Service/Admin/Material/MaterialService.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace App\Service\Admin\Material; -use App\Constants\Admin\MaterialCode; +use App\Constants\Common\MaterialCode; use App\Exception\ErrException; use App\Model\Material; use App\Service\Admin\BaseService; diff --git a/app/Service/Api/Material/MaterialService.php b/app/Service/Api/Material/MaterialService.php new file mode 100644 index 0000000..d550abe --- /dev/null +++ b/app/Service/Api/Material/MaterialService.php @@ -0,0 +1,44 @@ +request->input('limit', 10); + $name = $this->request->input('query_name'); + + $list = $this + ->MaterialModel + ->where('is_del',MaterialCode::IS_NO_DEL) + ->where('status',MaterialCode::ENABLE) + ->when(!empty($name), function ($query) use ($name) { + $query->where('name', 'like', "$name%"); + }) + ->paginate($limit)->toArray(); + + return $this->return->success('success',$list); + } + + + +} \ No newline at end of file