Merge branch '20241029_fl_order' of http://git.bjzxtw.org.cn:3000/zxt/admin_consumer

app/Controller/OrderController.php

@@ -58,38 +58,12 @@ 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' => 'required',
-                    'starttime' => 'required',
-                    'endtime' => 'required',
-                    'pageSize' => 'required',
-                    'page' => 'required',
-    
-                ],
-                [
-                    'ad_size_id.required' => '广告尺寸id不能为空',
-                    '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);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -103,24 +77,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']);
     }
@@ -557,4 +535,14 @@ class OrderController extends AbstractController
         $result = $this->orderServiceClient->delShoppingCartAD($requireData);
         return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
     }
+    /*
+     * 获取广告位的尺寸
+    
+     */
+    public function getAdSize()
+    {
+        // $data = [];
+        $result = $this->orderServiceClient->getAdSize();
+        return $result['code'] == 200? Result::success($result['data']) : Result::error($result['message']);
+    }
 }

app/JsonRpc/OrderService.php

@@ -147,4 +147,12 @@ class OrderService extends AbstractServiceClient implements OrderServiceInterfac
     {
         return $this->__request(__FUNCTION__, $data);
     }
+    /**
+     * 
+     * @return mixed
+     */
+    public function getAdSize()
+    {
+        return $this->__request(__FUNCTION__, []);
+    }
 }

app/JsonRpc/OrderServiceInterface.php

@@ -85,4 +85,8 @@ interface OrderServiceInterface
      * @param array $data
      */
     public function delShoppingCartAD(array $data);
+    /**
+     * @return mixed
+     */
+    public function getAdSize();
 }

config/api/order.php

@@ -62,7 +62,8 @@ Router::addGroup(
         Router::post('/addShoppingCartAD', [OrderController::class, 'addShoppingCartAD']);
         //删除购物车中的广告位
         Router::post('/delShoppingCartAD', [OrderController::class, 'delShoppingCartAD']);
-
+        //获取广告位的尺寸
+        Router::post('/getAdSize', [OrderController::class, 'getAdSize']);
 
     },
     ['middleware' => [FooMiddleware::class]]