feat:chef

2025-01-08 17:52:29 +08:00
parent ce9d16eeda
commit 804d65b725
6 changed files with 67 additions and 68 deletions
--- a/app/Controller/Admin/ChefController.php
+++ b/app/Controller/Admin/ChefController.php
@@ -42,13 +42,6 @@ class ChefController
        return (new ChefService())->chefDetailList();
    }

-    #[RequestMapping(path: "chef_info", methods: "GET")]
-    #[Scene(scene: "chef_info")]
-    public function chefInfo(chefRequest $request)
-    {
-        return (new chefService)->chefInfo();
-    }
-
    /**
     * 设置厨师数据
     * @param ChefRequest $request
@@ -61,15 +54,15 @@ class ChefController
        return (new ChefService)->settingChef();
    }

-    /**
-     * 删除厨师数据
-     * @param ChefRequest $request
-     * @return array
-     */
-    #[RequestMapping(path: "delete", methods: "GET")]
-    #[Scene(scene: "delete")]
-    public function delete(chefRequest $request)
-    {
-        return (new chefService)->delete();
-    }
+//    /**
+//     * 删除厨师数据
+//     * @param ChefRequest $request
+//     * @return array
+//     */
+//    #[RequestMapping(path: "delete", methods: "GET")]
+//    #[Scene(scene: "delete")]
+//    public function delete(chefRequest $request)
+//    {
+//        return (new chefService)->delete();
+//    }
 }
--- a/app/Model/Chef.php
+++ b/app/Model/Chef.php
@@ -4,13 +4,12 @@ declare(strict_types=1);

 namespace App\Model;

+use App\Constants\Admin\UserCode;
 use Hyperf\Database\Model\Builder;
 use Hyperf\DbConnection\Model\Model;

 /**
- * @property int $id 
- * @property string $name 
- * @property int $avatar_id 
+ * @property int $id
 * @property int $user_id 
 * @property string $profile 
 * @property string $specialties 
@@ -33,7 +32,7 @@ class Chef extends Model
    /**
     * The attributes that should be cast to native types.
     */
-    protected array $casts = ['id' => 'integer', 'avatar_id' => 'integer', 'user_id' => 'integer', 'is_del' => 'integer'];
+    protected array $casts = ['id' => 'integer', 'user_id' => 'integer', 'is_del' => 'integer'];

    const string CREATED_AT = 'create_time';

@@ -54,7 +53,7 @@ class Chef extends Model
     */
    public function getInfoByUserId(int $userId): \Hyperf\Database\Model\Model|Builder|null
    {
-        return $this->where('user_id', $userId)->first();
+        return $this->where('is_del',UserCode::IS_NO_DEL)->where('user_id', $userId)->first();
    }

 }
--- a/app/Request/Admin/ChefRequest.php
+++ b/app/Request/Admin/ChefRequest.php
@@ -25,7 +25,10 @@ class ChefRequest extends FormRequest
            'limit' => 'required|integer',
            'query_chef_name' =>'sometimes|string',
            'query_chef_id' =>'sometimes|integer|exists:admin_user,id',
-
+            'chef_id' =>'sometimes|integer|exists:admin_user,id',
+            'user_id' =>'required|integer|exists:chef,user_id',
+            'profile' =>'sometimes',
+            'specialties' =>'sometimes',
        ];
    }

@@ -36,17 +39,14 @@ class ChefRequest extends FormRequest
            'query_chef_id'
        ],
        'chef_detail_list' => [
-            'query_chef_name',
+            'chef_id',
        ],
-        'chefInfo' =>['id'],
        'setting_chef' => [
-            'name',
-            'avatar_id',
            'user_id',
            'profile',
            'specialties'
        ],
-        'delete' => ['id'],
+//        'delete' => ['id'],

    ];
 }
--- a/app/Service/Admin/System/ChefService.php
+++ b/app/Service/Admin/System/ChefService.php
@@ -41,7 +41,7 @@ class ChefService extends BaseService
            ->where('status',UserCode::ENABLE)
            ->where('role_id',RoleCode::CHEF)
            ->when(!empty($name), function ($query) use ($name) {
-                $query->where('name', 'like', "%{$name}%");
+                $query->where('chinese_name', 'like', "$name%");
            })
            ->when($id = $this->request->input('query_chef_id'), function ($query) use ($id) {
                $query->where('id', $id);
@@ -53,42 +53,24 @@ class ChefService extends BaseService

    public function chefDetailList(): array
    {
-        $name = $this->request->input('query_chef_name');
+        $chefId = (int)$this->request->input('chef_id');
+
        $list = $this
-            ->chefModel
-            ->where('is_del',UserCode::IS_NO_DEL)
-            ->when(!empty($name), function ($query) use ($name) {
-                $query->where('name', 'like', "%{$name}%");
+            ->adminUserModel
+            ->leftJoin('chef', 'admin_user.id', '=', 'chef.user_id')
+            ->where('admin_user.is_del',UserCode::IS_NO_DEL)
+            ->where('admin_user.status',UserCode::ENABLE)
+            ->where('admin_user.role_id',RoleCode::CHEF)
+            ->when(!empty($chefId), function ($query) use ($chefId) {
+                $query->where('admin_user.id', $chefId);
            })
-            ->get(['id','name','avatar_id','user_id','profile','specialties']);
+            ->get(['admin_user.id','admin_user.avatar','admin_user.chinese_name','chef.profile','chef.specialties']);

        if (empty($list)) return $this->return->success('success',['list' => []]);

        return $this->return->success('success',['list' => $list->toArray()]);
    }

-    /**
-     * 根据id获取厨师信息
-     * @return array
-     */
-    public function chefInfo(): array
-    {
-        $data = $this->chefModel
-            ->getInfoById((int)$this->request->input('id'));
-        if (empty($data)) throw new ErrException('数据不存在');
-
-        $res = [
-            'id' => $data->id,
-            'name' => $data->name,
-            'avatar_id' => $data->avatar_id,
-            'user_id' => $data->user_id,
-            'profile' => $data->profile,
-            'specialties' => $data->specialties,
-        ];
-
-        return $this->return->success('success', $res);
-    }
-
    /**
     * 设置厨师信息
     * @return array
@@ -96,18 +78,18 @@ class ChefService extends BaseService
    public function settingChef(): array
    {
        $userId = (int)$this->request->input('user_id');
-        $name = $this->request->input('name');
-        $avatarId = (int)$this->request->input('avatar_id');
        $profile = $this->request->input('profile');
        $specialties = $this->request->input('specialties');

        $info = $this->chefModel->getInfoByUserId($userId);

        if (!empty($info)) {
-            $info->name = $name;
-            $info->profile = $profile;
-            $info->specialties = $specialties;
-            $info->avatar_id = $avatarId;
+            if(!empty($profile))
+                $info->profile = $profile;
+            if(!empty($specialties))
+                $info->specialties = $specialties;
+        } else {
+            throw new ErrException('设置厨师信息失败');
        }

        if (!$info->save()) throw new ErrException('设置厨师信息失败');
--- a/app/Service/Admin/User/EmployeeService.php
+++ b/app/Service/Admin/User/EmployeeService.php
@@ -136,7 +136,7 @@ class EmployeeService extends BaseService
        $id = (int)$this->request->input('id');
        $name = $this->request->input('chinese_name');
        $account = $this->request->input('account');
-        $roleId = $this->request->input('role_id', 0);
+        $roleId = (int)$this->request->input('role_id', 0);

        $info = $this->adminUserModel->getAdminInfoById($id);
        if (empty($info)) throw new ErrException('数据不存在');
@@ -151,6 +151,7 @@ class EmployeeService extends BaseService
            //写入关联表
            $del = match ($info->role_id) {
                RoleCode::DRIVER => (new DriverSequence)->where('driver_id', $info->id)->delete(),
+                RoleCode::CHEF => (new Chef)->where('user_id', $info->id)->delete(),
                default => true,
            };

@@ -158,6 +159,7 @@ class EmployeeService extends BaseService
                RoleCode::DRIVER => (new DriverSequence)->insert([
                    'driver_id' => $info->id,
                ]),
+                RoleCode::CHEF => $this->addChef($info->id),
                default => true,
            };

@@ -171,7 +173,7 @@ class EmployeeService extends BaseService
        $info->avatar = $this->request->input('avatar',0);
        $info->role_id = $roleId;
        $info->city_id = $this->request->input('city_id', 0);
-        $info->section_id = $this->request->input('section_id', 0);
+//        $info->section_id = $this->request->input('section_id', 0);

        if (!$info->save()) throw new ErrException('账号修改失败');

@@ -194,7 +196,13 @@ class EmployeeService extends BaseService

        $info->is_del = UserCode::IS_DEL;

-        if (!$info->save()) throw new ErrException('账号删除失败');
+        $del = match ($info->role_id) {
+            RoleCode::DRIVER => (new DriverSequence)->where('driver_id', $info->id)->update(['is_del' => UserCode::IS_DEL]),
+            RoleCode::CHEF => (new Chef)->where('user_id', $info->id)->update(['is_del' => UserCode::IS_DEL]),
+            default => true,
+        };
+
+        if (!$info->save() || !$del) throw new ErrException('账号删除失败');

        return $this->return->success();
    }