From 2862d5229b2564b45face7c6ec3d3e3acccc1749 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 四月 2026 18:30:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpCruiseOrderClient.java | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 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 304f3bc..587d620 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
@@ -33,27 +33,20 @@
*
* @param order 订单信息
*/
- @PostMapping("/inner/cruiseOrder/addCruiseOrder")
+ @PostMapping("/logan/inner/cruiseOrder/addCruiseOrder")
R<Long> addCruiseOrder(@RequestBody XpCruiseOrder order);
- /**
- * 添加巡游任务 下发命令
- * @param dto
- * @return
- */
- @PostMapping("/inner/cruiseOrder/addCruiseMission")
- R<?> addCruiseMission(@RequestBody AddCruiseMissionDto dto);
/**
- * 查询并关闭订单信息 返回id信息
+ * 根据车辆VIN码取消订单
*
* @param vin 订单信息
*/
- @PostMapping("/inner/cruiseOrder/updateCruiseOrder")
- R<Long> updateCruiseOrder(@RequestParam String vin);
+ @PostMapping("/logan/inner/cruiseOrder/cancelCruiseOrderByVin")
+ R<Long> cancelCruiseOrderByVin(@RequestParam String vin);
/**
@@ -61,15 +54,15 @@
* @param orderId
* @return
*/
- @PostMapping("/inner/cruiseOrder/updateCruiseOrderId")
- R<Long> updateCruiseOrderId(@RequestParam Long orderId);
+ @PostMapping("/logan/inner/cruiseOrder/cancelCruiseOrderById")
+ R<?> cancelCruiseOrderById(@RequestParam Long orderId);
/**
- * 关闭
+ * 完成巡游订单
*/
- @PostMapping("/inner/cruiseOrder/closeCruiseOrder")
- R<Long> closeCruiseOrder(@RequestParam String vin);
+ @PostMapping("/logan/inner/cruiseOrder/completeCruiseOrder")
+ R<?> completeCruiseOrder(@RequestParam Long orderId);
/**
@@ -77,6 +70,14 @@
*
* @param orderId 订单信息id
*/
- @PostMapping("/inner/cruiseOrder/getCruiseOrder")
+ @PostMapping("/logan/inner/cruiseOrder/getCruiseOrder")
R<XpCruiseOrder> getCruiseOrder(@RequestParam Long orderId);
+
+ /**
+ * 终止所有没结束或者终止的订单
+ * @param vin
+ * @return
+ */
+ @PostMapping("/logan/inner/cruiseOrder/stopAllCruiseOrder")
+ R<?> stopAllCruiseOrder(@RequestParam String vin);
}
--
Gitblit v1.7.1