商品列表、分类管理、客户等级

app/Http/Controllers/Product/ProductCategoryController.php

@@ -34,7 +34,7 @@ class ProductCategoryController extends BaseController
     #[GetRoute('/tree', 'query')]
     public function tree(): JsonResponse
     {
-        return $this->success(ProductCategoryModel::getTreeData(onlyEnabled: true));
+        return $this->success(ProductCategoryModel::getTreeData(['id', 'name', 'parent_id'], true));
     }
 
     /** 上传商品分类图片文件 */

app/Http/Controllers/Product/ProductController.php

@@ -13,6 +13,7 @@ use App\Models\StoreModel;
 use App\Models\UserModel;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Modules\AnnoRoute\Attribute\DeleteRoute;
 use Modules\AnnoRoute\Attribute\GetRoute;
@@ -20,6 +21,7 @@ use Modules\AnnoRoute\Attribute\PostRoute;
 use Modules\AnnoRoute\Attribute\PutRoute;
 use Modules\AnnoRoute\Attribute\RequestAttribute;
 use Modules\Common\Http\Controllers\BaseController;
+use Modules\SystemTool\Services\SysFileService;
 
 /**
  * 商品档案管理
@@ -53,6 +55,21 @@ class ProductController extends BaseController
         return $this->success($data);
     }
 
+    /** 上传商品分类图片文件 */
+    #[PostRoute('/upload', 'create')]
+    public function uploadImage(Request $request, SysFileService $service): JsonResponse
+    {
+        $data = $request->validate(['file' => 'required|file']);
+        $result = $service->upload(
+            $data['file'],
+            10,
+            20,
+            Auth::id()
+        );
+        return $this->success($result);
+    }
+
+
     /** 创建商品（事务内建商品 + 同步等级价格） */
     #[PostRoute(authorize: 'create')]
     public function create(ProductFormRequest $request): JsonResponse

app/Http/Requests/Customer/CustomerLevelFormRequest.php

@@ -25,7 +25,7 @@ class CustomerLevelFormRequest extends BaseFormRequest
             'name' => ['required', 'string', 'max:50', $unique],
             'sort' => 'nullable|integer',
             'status' => 'nullable|integer|in:0,1',
-            'icon' => ['nullable', 'integer', new Exists(SysFileModel::class, 'id')],
+            'icon_id' => ['nullable', 'integer', new Exists(SysFileModel::class, 'id')],
         ];
     }
 
@@ -36,7 +36,7 @@ class CustomerLevelFormRequest extends BaseFormRequest
             'name.max' => '等级名称最长 50 个字符',
             'name.unique' => '等级名称已存在',
             'status.in' => '状态值不正确',
-            'icon.exists' => '请重新上传图片'
+            'icon_id.exists' => '请重新上传图片'
         ];
     }
 }

app/Http/Requests/Product/ProductCategoryFormRequest.php

@@ -2,7 +2,9 @@
 
 namespace App\Http\Requests\Product;
 
+use Illuminate\Validation\Rules\Exists;
 use Modules\Common\Http\Requests\BaseFormRequest;
+use Modules\SystemTool\Models\SysFileModel;
 
 /**
  * 商品分类 创建/编辑 验证
@@ -22,6 +24,7 @@ class ProductCategoryFormRequest extends BaseFormRequest
             'name' => 'required|string|max:50',
             'parent_id' => 'required|integer|min:0',
             'sort' => 'nullable|integer',
+            'icon_id' => ['nullable', 'integer', new Exists(SysFileModel::class, 'id')],
             'status' => 'nullable|integer|in:0,1',
         ];
     }
@@ -33,6 +36,7 @@ class ProductCategoryFormRequest extends BaseFormRequest
             'name.max' => '分类名称最长 50 个字符',
             'parent_id.min' => '父级分类ID不正确',
             'status.in' => '状态值不正确',
+            'icon_id.exists' => '请重新上传图片'
         ];
     }
 }

app/Http/Requests/Product/ProductFormRequest.php

@@ -2,7 +2,11 @@
 
 namespace App\Http\Requests\Product;
 
+use App\Models\ProductCategoryModel;
+use App\Models\SupplierModel;
+use Illuminate\Validation\Rules\Exists;
 use Modules\Common\Http\Requests\BaseFormRequest;
+use Modules\SystemTool\Models\SysFileModel;
 
 /**
  * 商品档案 创建/编辑 验证（含多等级价格 prices 数组）
@@ -14,14 +18,17 @@ class ProductFormRequest extends BaseFormRequest
     public function rules(): array
     {
         return [
+            'category_id' => ['required','integer', new Exists(ProductCategoryModel::class,'id')],
+            'supplier_id' => ['nullable','integer', 'exclude_if:supplier_id,0', new Exists(SupplierModel::class,'id')],
             'name' => 'required|string|max:100',
             'spec' => 'nullable|string|max:100',
-            'grade' => 'nullable|string|max:50',
             'unit' => 'nullable|string|max:20',
-            'category_id' => 'required|integer|exists:product_category,id',
-            'supplier_id' => 'nullable|integer|exclude_if:supplier_id,0|exists:supplier,id',
-            'image' => 'nullable|string|max:255',
+            'image_ids' => 'nullable|array|max:255',
+            'image_ids.*' => ['integer', new Exists(SysFileModel::class, 'id')],
+            'content' => 'nullable|string',
             'sort' => 'nullable|integer',
+            'shelf_life' => 'nullable|integer|min:0',
+            'stock' => 'nullable|integer|min:0',
             'status' => 'nullable|integer|in:0,1',
             'remark' => 'nullable|string|max:255',
             'prices' => 'nullable|array',