diff --git a/app/Controller/Admin/GoodController.php b/app/Controller/Admin/GoodController.php index 7452c32..349cd11 100644 --- a/app/Controller/Admin/GoodController.php +++ b/app/Controller/Admin/GoodController.php @@ -144,12 +144,10 @@ class GoodController /** * cycle 列表 - * @param GoodRequest $request * @return array */ - #[RequestMapping(path: "list_cycle", methods: "POST")] - #[Scene(scene: "list_cycle")] - public function cycleList(GoodRequest $request): array + #[RequestMapping(path: "list_cycle", methods: "GET")] + public function cycleList(): array { return (new CycleService)->handle(); } diff --git a/app/Request/Admin/GoodRequest.php b/app/Request/Admin/GoodRequest.php index b7da05c..65e7a79 100644 --- a/app/Request/Admin/GoodRequest.php +++ b/app/Request/Admin/GoodRequest.php @@ -46,10 +46,11 @@ class GoodRequest extends FormRequest } protected array $scenes = [ - 'add_spu' => ['date', 'kitchen_id', 'chef_id', 'title', 'sub_title', 'category_id', 'saleable'], + 'list_cycle' => [], + 'add_spu' => ['cycle_id', 'kitchen_id', 'chef_id', 'title', 'sub_title', 'category_id', 'saleable'], 'edit_spu' => ['id','kitchen_id', 'chef_id', 'title', 'sub_title', 'category_id', 'saleable'], 'del_spu' => ['id'], 'spu' => ['id'], - 'list_spu' => ['cycle_id'] + 'list_spu' => ['cycle_id'], ]; } diff --git a/app/Service/Admin/Good/CycleService.php b/app/Service/Admin/Good/CycleService.php index 1c02bf2..c2d340a 100644 --- a/app/Service/Admin/Good/CycleService.php +++ b/app/Service/Admin/Good/CycleService.php @@ -30,7 +30,7 @@ class CycleService extends BaseService $arr = $this->cycleModel->whereBetween('dates',[ date('Y-m-d',strtotime('-10 day',time())), date('Y-m-d',strtotime('+10 day',time())), - ])->orderBy('dates')->get(); + ])->orderBy('dates')->select(['id','dates'])->get(); if (empty($arr)) return $this->return->success('success',['list' => []]); $arr = $arr->toArray(); diff --git a/app/Service/Admin/Good/SpuService.php b/app/Service/Admin/Good/SpuService.php index da4bc9a..6db3e8a 100644 --- a/app/Service/Admin/Good/SpuService.php +++ b/app/Service/Admin/Good/SpuService.php @@ -78,10 +78,9 @@ class SpuService extends BaseService */ public function add(): array { - $date = $this->request->input('date',date('Y-m-d')); - - $cycleInfo = $this->cycleModel->getInfoByDate($date); + $cycleId = (int)$this->request->input('cycle_id'); + $cycleInfo = $this->cycleModel->getInfoById($cycleId); if (empty($cycleInfo)) throw new ErrException('没有该周期,请刷新后重新上传'); $title = $this->request->input('title'); diff --git a/sync/http/admin/good.http b/sync/http/admin/good.http new file mode 100644 index 0000000..e15f9b7 --- /dev/null +++ b/sync/http/admin/good.http @@ -0,0 +1,14 @@ +### 登录 +POST {{host}}/admin/login/user +Content-Type: application/x-www-form-urlencoded + +account=13632877014&password=123456 + +> {% + client.global.set("admin_token", response.body.data.token); +%} + +### 周期列表 +GET {{host}}/admin/good/list_cycle +Content-Type: application/x-www-form-urlencoded +Authorization: Bearer {{admin_token}}