order

app/Controller/OrderController.php

@@ -82,28 +82,43 @@ class OrderController extends AbstractController
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 
-    public function getOrderListAdmin()
+    /**
+     * 根据网站查找广告位
+     */
+    public function getWebsiteAd()
     {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'pageSize' => 'required',
-                'page' => 'required',
+                'width' => 'required',
+                'height' => 'required',
+                'starttime' => 'required',
+                'endtime' => 'required',
+
             ],
             [
-                'pageSize.required' => '显示条数不能为空',
-                'page.required' => '分页不能为空',
+                'width.required' => '图片宽度不能为空',
+                'height.required' => '图片高度不能为空',
+                'starttime.required' => '广告开始时间不能为空',
+                'endtime.required' => '广告结束时间不能为空',
+
             ]
         );
-        if (isset($requireData['status'])) {
+        if (!empty($requireData['website_id'])) {
             $validator = $this->validationFactory->make(
                 $requireData,
                 [
-                    'status' => 'required',
+                    'website_id' => 'required',
+                    'pageSize' => 'required',
+                    'page' => 'required',
+
                 ],
                 [
-                    'status.required' => '状态不能为空',
+                    'website_id.required' => '网站id不能为空',
+                    'pageSize.required' => '显示条数不能为空',
+                    'page.required' => '分页不能为空',
+
                 ]
             );
         }
@@ -112,8 +127,32 @@ class OrderController extends AbstractController
             return Result::error($errorMessage);
         }
 
+        $result = $this->orderServiceClient->getWebsiteAd($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    public function getOrderListAdmin()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'pageSize' => 'required',
+                'page' => 'required',
+
+            ],
+            [
+                'pageSize.required' => '显示条数不能为空',
+                'page.required' => '分页不能为空',
+
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
         $result = $this->orderServiceClient->getOrderListAdmin($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+
     }
 
     /**
@@ -251,16 +290,17 @@ class OrderController extends AbstractController
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
 
     }
+    // 获取订单详情
     public function getOrderDetailAdmin()
     {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'order_id' => 'required',
+                'id' => 'required',
             ],
             [
-                'order_id.required' => '订单id不能为空',
+                'id.required' => '订单id不能为空',
             ]
         );
         if ($validator->fails()) {
@@ -269,9 +309,10 @@ class OrderController extends AbstractController
         }
 
         $result = $this->orderServiceClient->getOrderDetailAdmin($requireData);
+
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
-    /***
+    /**
      * 删除订单
      */
     public function delOrderAD()
@@ -302,6 +343,7 @@ class OrderController extends AbstractController
         $result = $this->orderServiceClient->getOrderDetailAdmin($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
+    //审核订单状态
     public function applyOrderStatusAdmin()
     {
         $requireData = $this->request->all();
@@ -309,18 +351,16 @@ class OrderController extends AbstractController
             $requireData,
             [
                 'id' => 'required',
-
             ],
             [
                 'id.required' => 'id不能为空',
-
             ]
         );
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $result = $this->orderServiceClient->getOrderDetailAdmin($requireData);
+        $result = $this->orderServiceClient->applyOrderStatusAdmin($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     //修改订单价格
@@ -345,7 +385,7 @@ class OrderController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $result = $this->orderServiceClient->editOrderAdmin($requireData);
+        $result = $this->orderServiceClient->editPriceOrderAdmin($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     public function rejectOrderAdmin()

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
@@ -38,11 +45,11 @@ class OrderService extends AbstractServiceClient implements OrderServiceInterfac
     {
         return $this->__request(__FUNCTION__, $data);
     }
-    public function editOrderStatusAdmin(array $data)
+    public function applyOrderStatusAdmin(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
     }
-    public function editOrderAdmin(array $data)
+    public function editPriceOrderAdmin(array $data)
     {
         return $this->__request(__FUNCTION__, $data);
     }

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
      */
@@ -20,11 +23,11 @@ interface OrderServiceInterface
     /**
      * @param array $data
      */
-    public function editOrderStatusAdmin(array $data);
+    public function applyOrderStatusAdmin(array $data);
     /**
      * @param array $data
      */
-    public function editOrderAdmin(array $data);
+    public function editPriceOrderAdmin(array $data);
     /**
      * @param array $data
      */

config/api/order.php

@@ -14,7 +14,10 @@ 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']);
         //获取订单列表
         Router::post('/getOrderList', [OrderController::class, 'getOrderList']);