From e573bcde7b62752f43478df1148f17640c8d4656 Mon Sep 17 00:00:00 2001
From: ctexthuang <ctexthuang@qq.com>
Date: Tue, 25 Mar 2025 10:25:15 +0800
Subject: [PATCH] feat : spu

---
 app/Model/AdminUser.php               | 4 ++--
 app/Request/Admin/GoodRequest.php     | 3 ++-
 app/Service/Admin/Good/SpuService.php | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/Model/AdminUser.php b/app/Model/AdminUser.php
index b1c05db..e8072ca 100644
--- a/app/Model/AdminUser.php
+++ b/app/Model/AdminUser.php
@@ -79,9 +79,9 @@ class AdminUser extends Model
 
     /**
      * @param int $userId
-     * @return \Hyperf\Database\Model\Model|Builder|null
+     * @return \Hyperf\Database\Model\Model|Builder|AdminUser|null
      */
-    public function getAdminInfoByBindUserId(int $userId): \Hyperf\Database\Model\Model|Builder|null
+    public function getAdminInfoByBindUserId(int $userId): \Hyperf\Database\Model\Model|Builder|null|AdminUser
     {
         return $this->where('bind_user_id', $userId)->where('is_del',UserCode::IS_NO_DEL)->first();
     }
diff --git a/app/Request/Admin/GoodRequest.php b/app/Request/Admin/GoodRequest.php
index 594ea89..84fedb5 100644
--- a/app/Request/Admin/GoodRequest.php
+++ b/app/Request/Admin/GoodRequest.php
@@ -27,8 +27,9 @@ class GoodRequest extends FormRequest
             'chef_id' => 'required|integer|exists:chef,id',
             'title' => 'required|string',
             'sub_title' => 'string',
-            'category_id' => 'required|integer|exists:category,id',
+            'category_id' => 'required_if:type,1|integer|exists:category,id',
             'saleable' => 'required|integer|in:1,2',
+            'type' => 'required|integer|in:1,2',
             'id' => 'required|integer',
             'cycle_id' => 'required|integer|exists:cycle,id',
             'spu_id' => 'required|integer|exists:spu,id',
diff --git a/app/Service/Admin/Good/SpuService.php b/app/Service/Admin/Good/SpuService.php
index a26440d..a1a6869 100644
--- a/app/Service/Admin/Good/SpuService.php
+++ b/app/Service/Admin/Good/SpuService.php
@@ -151,6 +151,7 @@ class SpuService extends BaseService
         $insertModel->chef_id = $this->request->input('chef_id');
         $insertModel->title = $title;
         $insertModel->sub_title = $this->request->input('sub_title','');
+        $insertModel->caterer_id = $this->request->input('caterer_id');
         $insertModel->category_id = $this->request->input('category_id');
         $insertModel->saleable = $this->request->input('saleable');
         $insertModel->type = $this->request->input('type');
@@ -214,6 +215,7 @@ class SpuService extends BaseService
         $info->kitchen_id = $this->request->input('kitchen_id');
         $info->chef_id = $this->request->input('chef_id');
         $info->title = $this->request->input('title');
+        $info->caterer_id = $this->request->input('caterer_id');
         $info->sub_title = $this->request->input('sub_title','');
         $info->category_id = $this->request->input('category_id');
         $info->saleable = $this->request->input('saleable');