From 256f7a2471485dbea6eae1a1fe88bf8dc87d68fb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 三月 2026 19:32:01 +0800
Subject: [PATCH] 修改订单bug

---
 xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpCruiseOrderClient.java |   34 ++++++++++++++++++++++++++--------
 1 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpCruiseOrderClient.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpCruiseOrderClient.java
index 87e77ea..7260f2a 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpCruiseOrderClient.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpCruiseOrderClient.java
@@ -34,7 +34,7 @@
      * @param order 订单信息
      */
     @PostMapping("/inner/cruiseOrder/addCruiseOrder")
-    R<String> addCruiseOrder(@RequestBody XpCruiseOrder order);
+    R<Long> addCruiseOrder(@RequestBody XpCruiseOrder order);
 
 
     /**
@@ -48,19 +48,29 @@
 
 
     /**
-     * 查询并关闭订单信息  返回id信息
+     * 根据车辆VIN码取消订单
      *
      * @param vin 订单信息
      */
-    @PostMapping("/inner/cruiseOrder/updateCruiseOrder")
-    R<String> updateCruiseOrder(@RequestParam String vin);
+    @PostMapping("/inner/cruiseOrder/cancelCruiseOrderByVin")
+    R<Long> cancelCruiseOrderByVin(@RequestParam String vin);
 
 
     /**
-     * 关闭
+     * 根据订单ID查询取消订单
+     * @param orderId
+     * @return
      */
-    @PostMapping("/inner/cruiseOrder/closeCruiseOrder")
-    R<String> closeCruiseOrder(@RequestParam String vin);
+    @PostMapping("/inner/cruiseOrder/cancelCruiseOrderById")
+    R<?> cancelCruiseOrderById(@RequestParam Long orderId);
+
+
+    /**
+     * 完成巡游订单
+     */
+    @PostMapping("/inner/cruiseOrder/completeCruiseOrder")
+    R<?> completeCruiseOrder(@RequestParam Long orderId);
+
 
     /**
      * 查询订单信息
@@ -68,5 +78,13 @@
      * @param orderId 订单信息id
      */
     @PostMapping("/inner/cruiseOrder/getCruiseOrder")
-    R<XpCruiseOrder> getCruiseOrder(@RequestParam String orderId);
+    R<XpCruiseOrder> getCruiseOrder(@RequestParam Long orderId);
+
+    /**
+     * 终止所有没结束或者终止的订单
+     * @param vin
+     * @return
+     */
+    @PostMapping("/inner/cruiseOrder/stopAllCruiseOrder")
+    R<?> stopAllCruiseOrder(@RequestParam String vin);
 }

--
Gitblit v1.7.1