From c96fbe6b0aeb413a17c429133ee6d81d138144b9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 09 六月 2026 10:58:52 +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/factory/order/XpCruiseOrderClientFallbackFactory.java |   29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/factory/order/XpCruiseOrderClientFallbackFactory.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/factory/order/XpCruiseOrderClientFallbackFactory.java
index ad2130e..f3073a4 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/factory/order/XpCruiseOrderClientFallbackFactory.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/factory/order/XpCruiseOrderClientFallbackFactory.java
@@ -36,33 +36,34 @@
                 return null;
             }
 
+
             @Override
-            public R<?> addCruiseMission(AddCruiseMissionDto dto) {
-                log.error("订单服务调用失败: {}", cause.getMessage());
-                return null;
+            public R<XpCruiseOrder> cancelCruiseOrderByVin(String vin) {
+                log.error("根据车辆VIN码取消订单失败: {}", cause.getMessage());
+                return R.fail("根据车辆VIN码取消订单失败:" + cause.getMessage());
             }
 
             @Override
-            public R<Long> updateCruiseOrder(String vin) {
-                log.error("订单服务调用失败: {}", cause.getMessage());
-                return R.fail("根据车辆VIN查询取消订单失败:" + cause.getMessage());
-            }
-
-            @Override
-            public R<Long> updateCruiseOrderId(Long orderId) {
+            public R<XpCruiseOrder> cancelCruiseOrderById(Long orderId) {
                 return R.fail("根据订单ID查询取消订单失败:" + cause.getMessage());
             }
 
             @Override
-            public R<Long> closeCruiseOrder(String vin) {
-                log.error("订单服务调用失败: {}", cause.getMessage());
-                return R.fail("根据VIN码关闭巡游单失败");
+            public R<?> completeCruiseOrder(Long orderId) {
+                log.error("完成巡游订单失败: {}", cause.getMessage());
+                return R.fail("完成巡游订单失败");
             }
 
             @Override
             public R<XpCruiseOrder> getCruiseOrder(Long orderId) {
                 log.error("订单服务调用失败: {}", cause.getMessage());
-                return null;
+                return R.fail("订单服务调用失败:" + cause.getMessage());
+            }
+
+            @Override
+            public R<?> stopAllCruiseOrder(String vin) {
+                log.error("终止所有没结束或者终止的订单失败: {}", cause.getMessage());
+                return R.fail("终止所有没结束或者终止的订单失败::" + cause.getMessage());
             }
         };
     }

--
Gitblit v1.7.1