order/api

config/api/order.php

@@ -7,9 +7,6 @@ use Hyperf\HttpServer\Router\Router;
 
 Router::addGroup(
     '/order', function () {
-<<<<<<< HEAD
-
-=======
         //订单状态对应
         Router::get('/getStatus', [OrderController::class, 'getStatus']);        
         //查询广告
@@ -44,55 +41,19 @@ Router::addGroup(
         Router::post('/endOrderAdmin', [OrderController::class, 'endOrderAdmin']);
         //删除订单
         Router::post('/delOrderAdmin', [OrderController::class, 'delOrderAdmin']);
->>>>>>> 20241029_fl_order
-
-   //订单状态对应
-
 
-   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::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]]