From 11e55e11d3d3397cd2b54a65b2cda202be822296 Mon Sep 17 00:00:00 2001
From: yyy <1083599556@qq.com>
Date: 星期四, 30 四月 2026 09:21:54 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpCruiseOrderClient.java | 42 +++++++++++++++++++++++++++++++++++-------
1 files changed, 35 insertions(+), 7 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 17ecd43..36ed375 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
@@ -1,5 +1,6 @@
package com.xiaopeng.api.feignClient.order;
+import com.xiaopeng.api.dto.order.AddCruiseMissionDto;
import com.xiaopeng.api.dto.order.GetOrderNumDto;
import com.xiaopeng.api.dto.order.PopOrderDto;
import com.xiaopeng.api.dto.statistics.OrderStatisticsDTO;
@@ -32,17 +33,36 @@
*
* @param order 订单信息
*/
- @PostMapping("/inner/cruiseOrder/addCruiseOrder")
- R<String> addCruiseOrder(@RequestBody XpCruiseOrder order);
+ @PostMapping("/logan/inner/cruiseOrder/addCruiseOrder")
+ R<Long> addCruiseOrder(@RequestBody XpCruiseOrder order);
+
+
+
/**
- * 查询并关闭订单信息 返回id信息
+ * 根据车辆VIN码取消订单
*
* @param vin 订单信息
*/
- @PostMapping("/inner/cruiseOrder/updateCruiseOrder")
- R<String> updateCruiseOrder(@RequestParam String vin);
+ @PostMapping("/logan/inner/cruiseOrder/cancelCruiseOrderByVin")
+ R<XpCruiseOrder> cancelCruiseOrderByVin(@RequestParam String vin);
+
+
+ /**
+ * 根据订单ID查询取消订单
+ * @param orderId
+ * @return
+ */
+ @PostMapping("/logan/inner/cruiseOrder/cancelCruiseOrderById")
+ R<XpCruiseOrder> cancelCruiseOrderById(@RequestParam Long orderId);
+
+
+ /**
+ * 完成巡游订单
+ */
+ @PostMapping("/logan/inner/cruiseOrder/completeCruiseOrder")
+ R<?> completeCruiseOrder(@RequestParam Long orderId);
/**
@@ -50,6 +70,14 @@
*
* @param orderId 订单信息id
*/
- @PostMapping("/inner/cruiseOrder/getCruiseOrder")
- R<XpCruiseOrder> getCruiseOrder(@RequestParam String orderId);
+ @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