Merge branch 'dev' of https://gitee.com/zxt_5/admin_consumer into dev

app/Controller/CollectorController.php

@@ -263,6 +263,7 @@ class CollectorController extends AbstractController
                 break;
                 
         }
+
         if(isset($requireData['writer_class']) && $requireData['type'] != 3){
             $validator = $this->validationFactory->make(
                 $requireData,
@@ -278,6 +279,7 @@ class CollectorController extends AbstractController
                 return Result::error($errorMessage);
             }  
         }
+
         if(isset($requireData['writer']) && $requireData['type'] != 3){
             $validator = $this->validationFactory->make(
                 $requireData,
@@ -293,7 +295,6 @@ class CollectorController extends AbstractController
                 return Result::error($errorMessage);
             }  
         }
-
         // return Result::success($requireData);
         $result = $this->collectorServiceClient->addRule($requireData);
         if ($result['code'] != ErrorCode::SUCCESS) {
@@ -481,21 +482,7 @@ class CollectorController extends AbstractController
                 break;
                 
         }
-        if(isset($requireData['source']) && $requireData['type'] != 3){
-            $validator = $this->validationFactory->make(
-                $requireData,
-                [
-                    'source' => 'required'
-                ],
-                [
-                    'source.required' => '文章来源不能为空'
-                ]
-            ); 
-            if ($validator->fails()) {
-                $errorMessage = $validator->errors()->first();
-                return Result::error($errorMessage);
-            }  
-        }
+
         if(isset($requireData['writer_class']) && $requireData['type'] != 3){
             $validator = $this->validationFactory->make(
                 $requireData,
@@ -532,6 +519,7 @@ class CollectorController extends AbstractController
             return Result::error($result['message'],0,[]);
         }
         return Result::success($result['data']);
+
     } 
     /**
     * 删除任务规则

app/Controller/OrderController.php

@@ -59,36 +59,38 @@ class OrderController extends AbstractController
 
     }
     /**
-     * 查询广告位
+     * 获取广告尺寸及查询广告位
      */
     public function getAD()
     {
         $requireData = $this->request->all();
-        $validator = $this->validationFactory->make(
-            $requireData,
-            [
-                'width' => 'required',
-                'height' => 'required',
-                'starttime' => 'required',
-                'endtime' => 'required',
-                'pageSize' => 'required',
-                'page' => 'required',
-
-            ],
-            [
-                'width.required' => '图片宽度不能为空',
-                'height.required' => '图片高度不能为空',
-                'starttime.required' => '广告开始时间不能为空',
-                'endtime.required' => '广告结束时间不能为空',
-                'pageSize.required' => '显示条数不能为空',
-                'page.required' => '分页不能为空',
-
-            ]
-        );
-        if ($validator->fails()) {
-            $errorMessage = $validator->errors()->first();
-            return Result::error($errorMessage);
+        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);
+            }
         }
+        
+        
         $result = $this->orderServiceClient->getAD($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -102,34 +104,28 @@ class OrderController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'width' => 'required',
-                'height' => 'required',
+                'ad_size_id' => 'required',
                 'starttime' => 'required',
                 'endtime' => 'required',
-
+                'pageSize' => 'required',
+                'page' => 'required',
             ],
             [
-                'width.required' => '图片宽度不能为空',
-                'height.required' => '图片高度不能为空',
+                'ad_size_id.required' => '广告尺寸id不能为空',
                 'starttime.required' => '广告开始时间不能为空',
                 'endtime.required' => '广告结束时间不能为空',
-
+                'pageSize.required' => '显示条数不能为空',
+                'page.required' => '分页不能为空'
             ]
         );
         if (!empty($requireData['website_id'])) {
             $validator = $this->validationFactory->make(
                 $requireData,
                 [
-                    'website_id' => 'required',
-                    'pageSize' => 'required',
-                    'page' => 'required',
-
+                    'website_id' => 'required'
                 ],
                 [
-                    'website_id.required' => '网站id不能为空',
-                    'pageSize.required' => '显示条数不能为空',
-                    'page.required' => '分页不能为空',
-
+                    'website_id.required' => '网站id不能为空'
                 ]
             );
         }
@@ -176,8 +172,7 @@ class OrderController extends AbstractController
             [
 
                 'name' => 'required',
-                'width' => 'required',
-                'height' => 'required',
+                'ad_size_id' => 'required',
                 'starttime' => 'required',
                 'endtime' => 'required',
                 'imgurl' => 'required',
@@ -186,8 +181,7 @@ class OrderController extends AbstractController
             ],
             [
                 'name.required' => '广告名称不能为空',
-                'width.required' => '图片宽度不能为空',
-                'height.required' => '图片高度不能为空',
+                'ad_size_id.required' => '广告图片尺寸id不能为空',
                 'starttime.required' => '广告开始时间不能为空',
                 'endtime.required' => '广告结束时间不能为空',
                 'imgurl.required' => '图片广告链接不能为空',

app/Controller/WebsiteController.php

@@ -1046,7 +1046,7 @@ class WebsiteController extends AbstractController
     }
 
     /**
-     * 检测网站网址是否存在
+     * 检测网站网址是否存在1
      * @return array
      */
     public function checkWebsiteUrl()

app/JsonRpc/OrderService.php

@@ -16,7 +16,7 @@ class OrderService extends AbstractServiceClient implements OrderServiceInterfac
      * @var string
      */
     protected string $protocol = 'jsonrpc-http';
-
+   
     /**
      * @param array $data
      * @return mixed
@@ -65,7 +65,6 @@ class OrderService extends AbstractServiceClient implements OrderServiceInterfac
     {
         return $this->__request(__FUNCTION__, $data);
     }
-
     /**
      * @param array $data
      * @return mixed

app/JsonRpc/OrderServiceInterface.php

@@ -4,6 +4,7 @@ namespace App\JsonRpc;
 
 interface OrderServiceInterface
 {
+   
     /**
      * @param array $data
      */
@@ -40,7 +41,7 @@ interface OrderServiceInterface
      * @param array $data
      */
     public function delOrderAdmin(array $data);
-
+    
     /**
      * @param array $data
      */

config/api/order.php

@@ -7,56 +7,53 @@ use Hyperf\HttpServer\Router\Router;
 
 Router::addGroup(
     '/order', function () {
-   //测试
-   Router::get('/index', [OrderController::class, 'index']);
-
-   //订单状态对应
-
-
-   Router::get('/getStauts', [OrderController::class, 'getStauts']);
-   
-   //查询广告
-   Router::post('/getAD', [OrderController::class, 'getAD']);
-   //根据网站搜索广告
-   Router::post('/getWebsiteAd', [OrderController::class, 'getWebsiteAd']);
-   //添加订单
-
-   Router::post('/addAD', [OrderController::class, 'addAD']);
-   //获取订单列表
-   Router::post('/getOrderList', [OrderController::class, 'getOrderList']);
-   //获取订单详情
-   Router::post('/getOrderDetail', [OrderController::class, 'getOrderDetail']);
-   //撤回订单
-   Router::post('/cancelOrder', [OrderController::class, 'cancelOrder']);
-   //删除广告
-   Router::post('/delOrderAD', [OrderController::class, 'delOrderAD']);
-
-   //后台管理
-   //获取订单列表
-   Router::post('/getOrderListAdmin', [OrderController::class, 'getOrderListAdmin']);
-   //获取订单详情
-   Router::post('/getOrderDetailAdmin', [OrderController::class, 'getOrderDetailAdmin']);
-   //审核订单
-   Router::post('/applyOrderStatusAdmin', [OrderController::class, 'applyOrderStatusAdmin']);
-   //修改订单价格
-   Router::post('/editPriceOrderAdmin', [OrderController::class, 'editPriceOrderAdmin']);
-   //驳回订单
-   Router::post('/rejectOrderAdmin', [OrderController::class, 'rejectOrderAdmin']);
-   //结束订单
-   Router::post('/endOrderAdmin', [OrderController::class, 'endOrderAdmin']);
-   //删除订单
-   Router::post('/delOrderAdmin', [OrderController::class, 'delOrderAdmin']);
-
-   //获取广告列表
-   Router::post('/getADList', [OrderController::class, 'getADList']);
-   //获取广告详情
-   Router::post('/getADDetail', [OrderController::class, 'getADDetail']);
-   //添加广告
-   Router::post('/addADAdmin', [OrderController::class, 'addAD']);
-   //修改广告
-   Router::post('/editAD', [OrderController::class, 'editAD']);
-   //删除广告
-   Router::post('/delAD', [OrderController::class, 'delAD']);
+        //订单状态对应
+        Router::get('/getStatus', [OrderController::class, 'getStatus']);        
+        //查询广告
+        Router::post('/getAD', [OrderController::class, 'getAD']);
+        //根据网站搜索广告
+        Router::post('/getWebsiteAd', [OrderController::class, 'getWebsiteAd']);
+        //添加订单
+        Router::post('/addAD', [OrderController::class, 'addAD']);
+
+        //获取订单列表
+        Router::get('/getOrderList', [OrderController::class, 'getOrderList']);
+        //获取订单详情
+        Router::get('/getOrderDetail', [OrderController::class, 'getOrderDetail']);
+        //撤回订单
+        Router::get('/cancelOrder', [OrderController::class, 'cancelOrder']);
+        //删除广告
+        Router::get('/delOrderAD', [OrderController::class, 'delOrderAD']);
+
+        
+        //后台管理
+        //获取订单列表
+        Router::post('/getOrderListAdmin', [OrderController::class, 'getOrderListAdmin']);
+        //获取订单详情
+        Router::post('/getOrderDetailAdmin', [OrderController::class, 'getOrderDetailAdmin']);
+        //审核订单
+        Router::post('/applyOrderStatusAdmin', [OrderController::class, 'applyOrderStatusAdmin']);
+        //修改订单价格
+        Router::post('/editPriceOrderAdmin', [OrderController::class, 'editPriceOrderAdmin']);
+        //驳回订单
+        Router::post('/rejectOrderAdmin', [OrderController::class, 'rejectOrderAdmin']);
+        //结束订单
+        Router::post('/endOrderAdmin', [OrderController::class, 'endOrderAdmin']);
+        //删除订单
+        Router::post('/delOrderAdmin', [OrderController::class, 'delOrderAdmin']);
+
+
+
+        //获取广告列表
+        Router::post('/getADList', [OrderController::class, 'getADList']);
+        //获取广告详情
+        Router::post('/getADDetail', [OrderController::class, 'getADDetail']);
+        //添加广告
+        Router::post('/addADAdmin', [OrderController::class, 'addAD']);
+        //修改广告
+        Router::post('/editAD', [OrderController::class, 'editAD']);
+        //删除广告
+        Router::post('/delAD', [OrderController::class, 'delAD']);
 
     },
     ['middleware' => [FooMiddleware::class]]