删除方法合并代码错误修改

app/Controller/OrderController.php

@@ -326,7 +326,7 @@ class OrderController extends AbstractController
     /**
      * 删除订单
      */
-    public function delOrderAD()
+    public function delOrderAdmin()
     {
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
@@ -337,12 +337,7 @@ class OrderController extends AbstractController
 
             ],
             [
-                'id.required' => 'id不能为空',
-
-                'order_id' => 'required',
-            ],
-            [
-                'name.required' => '订单id不能为空',
+                'id.required' => '订单id不能为空',
 
             ]
         );
@@ -351,7 +346,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 +438,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 +451,7 @@ class OrderController extends AbstractController
 
             ],
             [
-                'id.required' => 'id不能为空',
+                'id.required' => '订单id不能为空',
 
             ]
         );
@@ -461,7 +459,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']);
     }
 }