the_bug 6 mesiacov pred
rodič
commit
9071fa3ec6

+ 49 - 2
app/Controller/OrderController.php

@@ -81,7 +81,54 @@ class OrderController extends AbstractController
         $result = $this->orderServiceClient->getAD($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
- 
+    /**
+     * 根据网站查找广告位
+     */
+    public function getWebsiteAd()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'width' => 'required',
+                'height' => 'required',
+                'starttime' => 'required',
+                'endtime' => 'required'
+
+            ],
+            [
+                'width.required' => '图片宽度不能为空',
+                'height.required' => '图片高度不能为空',
+                'starttime.required' => '广告开始时间不能为空',
+                'endtime.required' => '广告结束时间不能为空'
+
+            ]
+        );
+        if(!empty($requireData['website_id'])){
+            $validator = $this->validationFactory->make(
+                $requireData,
+                [
+                    'website_id' => 'required',
+                    'pageSize' => 'required',
+                    'page' => 'required'
+    
+                ],
+                [
+                    'website_id.required' => '网站id不能为空',
+                    'pageSize.required' => '显示条数不能为空',
+                    'page.required' => '分页不能为空'
+    
+                ]
+            );
+        }
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+
+        $result = $this->orderServiceClient->getWebsiteAd($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
     public function getOrderListAdmin(){}
  
      /**
@@ -222,7 +269,7 @@ class OrderController extends AbstractController
 
     }
     public function getOrderDetailAdmin()
- 
+    {
         $requireData['user_id'] =Context::get("UserId");
         $result = $this->orderServiceClient->cancelOrder($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);

+ 8 - 1
app/JsonRpc/OrderService.php

@@ -25,7 +25,14 @@ class OrderService extends AbstractServiceClient implements OrderServiceInterfac
     {
         return $this->__request(__FUNCTION__, $data);
     }
-
+        /**
+     * @param array $data
+     * @return mixed
+     */
+    public function getWebsiteAd(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
     /**
      * @param array $data
      * @return mixed

+ 4 - 1
app/JsonRpc/OrderServiceInterface.php

@@ -8,7 +8,10 @@ interface OrderServiceInterface
      * @param array $data
      */
     public function getAD(array $data);
-
+    /**
+     * @param array $data
+     */
+    public function getWebsiteAd(array $data);
     /**
      * @param array $data
      */

+ 3 - 1
config/api/order.php

@@ -1,6 +1,6 @@
 <?php
 
-declare (strict_types = );
+declare (strict_types = 1);
 use App\Controller\OrderController;
 use App\Middleware\Auth\FooMiddleware;
 use Hyperf\HttpServer\Router\Router;
@@ -14,6 +14,8 @@ Router::addGroup(
         Router::post('/getStauts', [OrderController::class, 'getStauts']);
         //查询广告  
         Router::post('/getAD', [OrderController::class, 'getAD']);
+        //根据网站搜索广告  
+        Router::post('/getWebsiteAd', [OrderController::class, 'getWebsiteAd']);
         //添加订单 
         Router::post('/addAD', [OrderController::class, 'addAD']);
         //获取订单列表