merge order

app/Controller/OrderController.php

@@ -26,35 +26,31 @@ class OrderController extends AbstractController
      */
     #[Inject]
     private $orderServiceClient;
-    public function index(RequestInterface $request, ResponseInterface $response)
-    {
-        return $response->raw('Hello Hyperf!');
-    }
-
     /***
      * 状态说明
      */
-    public function getStauts()
+    public function getStatus()
     {
         $data['order'] = [
-            1 => '通过',
-            2 => '驳回',
-            3 => '撤回',
-            4 => '修改',
-            5 => '过期',
+            1 => '已通过',
+            2 => '已驳回',
+            3 => '已撤回',
+            4 => '已修改',
+            5 => '已过期',
             6 => '待审核',
-            7 => '结束',
+            7 => '已结束'
         ];
         $data['order_ad'] = [
             1 => '待投放',
-            2 => '驳回',
-            3 => '撤回',
-            4 => '修改',
-            5 => '过期',
+            2 => '已驳回',
+            3 => '已撤回',
+            4 => '已修改',
+            5 => '已过期',
             6 => '待审核',
-            7 => '结束',
-            8 => '投放中',
+            7 => '已结束',
+            8 => '投放中'
         ];
+
         return Result::success($data);
 
     }
@@ -326,7 +322,7 @@ class OrderController extends AbstractController
     /**
      * 删除订单
      */
-    public function delOrderAD()
+    public function delOrderAdmin()
     {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
@@ -337,12 +333,7 @@ class OrderController extends AbstractController
 
             ],
             [
-                'id.required' => 'id不能为空',
-
-                'order_id' => 'required',
-            ],
-            [
-                'name.required' => '订单id不能为空',
+                'id.required' => '订单id不能为空',
 
             ]
         );
@@ -351,7 +342,7 @@ class OrderController extends AbstractController
             return Result::error($errorMessage);
         }
 
-        $result = $this->orderServiceClient->getOrderDetailAdmin($requireData);
+        $result = $this->orderServiceClient->delOrderAdmin($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     //审核订单状态
@@ -443,7 +434,10 @@ class OrderController extends AbstractController
         $result = $this->orderServiceClient->endOrderAdmin($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
-    public function delOrderAdmin()
+    /**
+     * 用户删除自己已失效的订单
+     */
+    public function delOrderAD()
     {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
@@ -453,7 +447,7 @@ class OrderController extends AbstractController
 
             ],
             [
-                'id.required' => 'id不能为空',
+                'id.required' => '订单id不能为空',
 
             ]
         );
@@ -461,7 +455,7 @@ class OrderController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $result = $this->orderServiceClient->delOrderAdmin($requireData);
+        $result = $this->orderServiceClient->delOrderAD($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
 }

config/api/order.php

@@ -7,20 +7,23 @@ use Hyperf\HttpServer\Router\Router;
 
 Router::addGroup(
     '/order', function () {
-        //测试
-        Router::get('/index', [OrderController::class, 'index']);
-        //查询广告  1
+
+        //订单状态对应
+        Router::get('/getStatus', [OrderController::class, 'getStatus']);
+        //查询广告
         Router::post('/getAD', [OrderController::class, 'getAD']);
-        //添加订单 1
+        //根据网站搜索广告
+        Router::post('/getWebsiteAd', [OrderController::class, 'getWebsiteAd']);
+        //添加订单
         Router::post('/addAD', [OrderController::class, 'addAD']);
-        //获取订单列表 1
-        Router::post('/getOrderList', [OrderController::class, 'getOrderList']);
-        //获取订单详情  1
-        Router::post('/getOrderDetail', [OrderController::class, 'getOrderDetail']);
-        //撤回订单 1
-        Router::post('/cancelOrder', [OrderController::class, 'cancelOrder']);
+        //获取订单列表
+        Router::get('/getOrderList', [OrderController::class, 'getOrderList']);
+        //获取订单详情
+        Router::get('/getOrderDetail', [OrderController::class, 'getOrderDetail']);
+        //撤回订单
+        Router::get('/cancelOrder', [OrderController::class, 'cancelOrder']);
         //删除广告
-        Router::post('/delOrderAD', [OrderController::class, 'delOrderAD']);
+        Router::get('/delOrderAD', [OrderController::class, 'delOrderAD']);
 
         //后台管理
         //获取订单列表 1