1

app/Controller/OrderController.php

@@ -6,11 +6,11 @@ namespace App\Controller;
 
 use App\JsonRpc\OrderServiceInterface;
 use App\Tools\Result;
+use Hyperf\Context\Context;
 use Hyperf\Di\Annotation\Inject;
 use Hyperf\HttpServer\Contract\RequestInterface;
 use Hyperf\HttpServer\Contract\ResponseInterface;
 use Hyperf\Validation\Contract\ValidatorFactoryInterface;
-use Hyperf\Context\Context;
 
 /**
  * Class OrderController
@@ -30,7 +30,7 @@ class OrderController extends AbstractController
     {
         return $response->raw('Hello Hyperf!');
     }
- 
+
     /***
      * 状态说明
      */
@@ -42,10 +42,10 @@ class OrderController extends AbstractController
             3 => '撤回',
             4 => '修改',
             5 => '过期',
-            6 => '待审核'
+            6 => '待审核',
         ];
         return Result::success($data);
- 
+
     }
     /**
      * 查询广告位
@@ -61,7 +61,7 @@ class OrderController extends AbstractController
                 'starttime' => 'required',
                 'endtime' => 'required',
                 'pageSize' => 'required',
-                'page' => 'required'
+                'page' => 'required',
 
             ],
             [
@@ -70,7 +70,7 @@ class OrderController extends AbstractController
                 'starttime.required' => '广告开始时间不能为空',
                 'endtime.required' => '广告结束时间不能为空',
                 'pageSize.required' => '显示条数不能为空',
-                'page.required' => '分页不能为空'
+                'page.required' => '分页不能为空',
 
             ]
         );
@@ -81,20 +81,51 @@ class OrderController extends AbstractController
         $result = $this->orderServiceClient->getAD($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
- 
-    public function getOrderListAdmin(){}
- 
-     /**
+
+    public function getOrderListAdmin()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'pageSize' => 'required',
+                'page' => 'required',
+            ],
+            [
+                'pageSize.required' => '显示条数不能为空',
+                'page.required' => '分页不能为空',
+            ]
+        );
+        if (isset($requireData['status'])) {
+            $validator = $this->validationFactory->make(
+                $requireData,
+                [
+                    'status' => 'required',
+                ],
+                [
+                    'status.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']);
+    }
+
+    /**
      * 添加订单
      */
     public function addAD()
- 
     {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,
             [
- 
+
                 'name' => 'required',
                 'width' => 'required',
                 'height' => 'required',
@@ -102,7 +133,7 @@ class OrderController extends AbstractController
                 'endtime' => 'required',
                 'imgurl' => 'required',
                 'imgsrc' => 'required',
-                'pid' => 'required'
+                'pid' => 'required',
             ],
             [
                 'name.required' => '广告名称不能为空',
@@ -112,17 +143,16 @@ class OrderController extends AbstractController
                 'endtime.required' => '广告结束时间不能为空',
                 'imgurl.required' => '图片广告链接不能为空',
                 'imgsrc.required' => '图片广告地址不能为空',
-                'pid.required' => '广告位id不能为空'
+                'pid.required' => '广告位id不能为空',
 
             ]
         );
-        
-        
+
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] =Context::get("UserId");
+        $requireData['user_id'] = Context::get("UserId");
         $commaSeparatedString = $requireData['pid'];
         $array = explode(",", $commaSeparatedString);
         $requireData['pid'] = $array;
@@ -140,21 +170,22 @@ class OrderController extends AbstractController
             $requireData,
             [
                 'pageSize' => 'required',
-                'page' => 'required'
+                'page' => 'required',
             ],
             [
                 'pageSize.required' => '显示条数不能为空',
-                'page.required' => '分页不能为空'
+                'page.required' => '分页不能为空',
+
             ]
         );
-        if(isset($requireData['status'])){
+        if (isset($requireData['status'])) {
             $validator = $this->validationFactory->make(
                 $requireData,
                 [
-                    'status' => 'required'
+                    'status' => 'required',
                 ],
                 [
-                    'status.required' => '状态不能为空'
+                    'status.required' => '状态不能为空',
                 ]
             );
         }
@@ -162,7 +193,7 @@ class OrderController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] =Context::get("UserId");
+        $requireData['user_id'] = Context::get("UserId");
         $result = $this->orderServiceClient->getOrderList($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -177,22 +208,21 @@ class OrderController extends AbstractController
             [
                 'order_id' => 'required',
                 'pageSize' => 'required',
-                'page' => 'required'
+                'page' => 'required',
             ],
             [
                 'name.required' => '订单id不能为空',
                 'pageSize.required' => '显示条数不能为空',
-                'page.required' => '分页不能为空'
+                'page.required' => '分页不能为空',
 
             ]
         );
-        
-        
+
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $requireData['user_id'] =Context::get("UserId");
+        $requireData['user_id'] = Context::get("UserId");
         $result = $this->orderServiceClient->getOrderDetail($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -208,55 +238,67 @@ class OrderController extends AbstractController
                 'order_id' => 'required',
             ],
             [
-                'name.required' => '订单id不能为空'
+                'name.required' => '订单id不能为空',
             ]
         );
- 
+
         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']);
 
     }
     public function getOrderDetailAdmin()
- 
-        $requireData['user_id'] =Context::get("UserId");
-        $result = $this->orderServiceClient->cancelOrder($requireData);
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'order_id' => 'required',
+            ],
+            [
+                'order_id.required' => '订单id不能为空',
+            ]
+        );
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+
+        $result = $this->orderServiceClient->getOrderDetailAdmin($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /***
      * 删除订单
      */
     public function delOrderAD()
- 
     {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,
             [
- 
+
                 'id' => 'required',
 
             ],
             [
                 'id.required' => 'id不能为空',
 
- 
                 'order_id' => 'required',
             ],
             [
-                'name.required' => '订单id不能为空'
- 
+                'name.required' => '订单id不能为空',
+
             ]
         );
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
- 
+
         $result = $this->orderServiceClient->getOrderDetailAdmin($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
@@ -369,10 +411,10 @@ class OrderController extends AbstractController
             return Result::error($errorMessage);
         }
         $result = $this->orderServiceClient->delOrderAdmin($requireData);
- 
-        $requireData['user_id'] =Context::get("UserId");
+
+        $requireData['user_id'] = Context::get("UserId");
         $result = $this->orderServiceClient->delOrderAD($requireData);
- 
+
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 }

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;
@@ -12,23 +12,23 @@ Router::addGroup(
 
         //订单状态对应
         Router::post('/getStauts', [OrderController::class, 'getStauts']);
-        //查询广告  
+        //查询广告
         Router::post('/getAD', [OrderController::class, 'getAD']);
-        //添加订单 
+        //添加订单
         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']);