Merge branch '20241029_fl_order' into dev

app/Controller/OrderController.php

@@ -64,47 +64,10 @@ class OrderController extends AbstractController
         return Result::success($data);
     }
     /**
-     * 获取广告尺寸及查询广告位
+     * 获取广告尺寸
      */
     public function getAD()
     {
-        $requireData = $this->request->all();
-        if(!empty($requireData)){
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'ad_size_id' => [
-                        'nullable',
-                        function ($attribute, $value, $fail) {
-                            if ($value === null) {
-                                return true;
-                            }
-                            if (is_numeric($value)) {
-                                return true;
-                            }
-                            if (is_array($value) && count(array_filter($value, 'is_numeric')) === count($value)) {
-                                return true;
-                            }
-                            $fail($attribute.' 必须是一个数字或者一个只包含数字的数组');
-                        },
-                    ],
-                    'starttime' => 'required',
-                    'endtime' => 'required',
-                    'pageSize' => 'required',
-                    'page' => 'required',
-                ],
-                [
-                    'starttime.required' => '广告开始时间不能为空',
-                    'endtime.required' => '广告结束时间不能为空',
-                    'pageSize.required' => '显示条数不能为空',
-                    'page.required' => '分页不能为空',
-                ]
-            );
-            if ($validator->fails()) {
-                $errorMessage = $validator->errors()->first();
-                return Result::error($errorMessage);
-            }
-        }
         $requireData['website_id'] = Context::get("WebsiteId")??'2';
         // return Result::success($requireData);
         $result = $this->orderServiceClient->getAD($requireData);
@@ -120,24 +83,28 @@ class OrderController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'ad_size_id' => 'required',
+                'ad_size_id' => 'required|integer',
                 'starttime' => 'required',
                 'endtime' => 'required',
-                'pageSize' => 'required',
-                'page' => 'required',
+                'pageSize' =>'required|integer',
+                'page' =>'required|integer'
             ],
             [
                 'ad_size_id.required' => '广告尺寸id不能为空',
+                'ad_size_id.integer' => '广告尺寸id格式不正确',
                 'starttime.required' => '广告开始时间不能为空',
                 'endtime.required' => '广告结束时间不能为空',
                 'pageSize.required' => '显示条数不能为空',
-                'page.required' => '分页不能为空'
+                'pageSize.integer' => '显示条数格式不正确',
+                'page.required' => '分页不能为空',
+                'page.integer' => '分页格式不正确',
             ]
         );
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
+        $requireData['website_id'] = Context::get("WebsiteId")??'2';
         $result = $this->orderServiceClient->getWebsiteAd($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }