From 46342ddcf5d52ccbf2ae8d8a9a0b14cc0d29b250 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 16 四月 2026 22:14:20 +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 |   19 ++++++-------------
 1 files changed, 6 insertions(+), 13 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 7260f2a..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,17 +33,10 @@
      *
      * @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);
 
 
 
@@ -52,7 +45,7 @@
      *
      * @param vin 订单信息
      */
-    @PostMapping("/inner/cruiseOrder/cancelCruiseOrderByVin")
+    @PostMapping("/logan/inner/cruiseOrder/cancelCruiseOrderByVin")
     R<Long> cancelCruiseOrderByVin(@RequestParam String vin);
 
 
@@ -61,14 +54,14 @@
      * @param orderId
      * @return
      */
-    @PostMapping("/inner/cruiseOrder/cancelCruiseOrderById")
+    @PostMapping("/logan/inner/cruiseOrder/cancelCruiseOrderById")
     R<?> cancelCruiseOrderById(@RequestParam Long orderId);
 
 
     /**
      * 完成巡游订单
      */
-    @PostMapping("/inner/cruiseOrder/completeCruiseOrder")
+    @PostMapping("/logan/inner/cruiseOrder/completeCruiseOrder")
     R<?> completeCruiseOrder(@RequestParam Long orderId);
 
 
@@ -77,7 +70,7 @@
      *
      * @param orderId 订单信息id
      */
-    @PostMapping("/inner/cruiseOrder/getCruiseOrder")
+    @PostMapping("/logan/inner/cruiseOrder/getCruiseOrder")
     R<XpCruiseOrder> getCruiseOrder(@RequestParam Long orderId);
 
     /**
@@ -85,6 +78,6 @@
      * @param vin
      * @return
      */
-    @PostMapping("/inner/cruiseOrder/stopAllCruiseOrder")
+    @PostMapping("/logan/inner/cruiseOrder/stopAllCruiseOrder")
     R<?> stopAllCruiseOrder(@RequestParam String vin);
 }

--
Gitblit v1.7.1