From 34f84e20bca7b2fa47c2b168ea73d754b232579a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 25 二月 2026 13:56:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
index a481900..b5beb30 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
@@ -8,6 +8,7 @@
import com.xiaopeng.api.dto.vehicleConvoy.BaseVehicleUserDto;
import com.xiaopeng.api.feignClient.automaticPilot.OrderMissionClient;
import com.xiaopeng.api.feignClient.map.XpMapClient;
+import com.xiaopeng.api.feignClient.order.XpCruiseOrderClient;
import com.xiaopeng.api.feignClient.order.XpOrderClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.UserVehicleClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
@@ -65,7 +66,7 @@
private IXpTradingStrategyService xpTradingStrategyService;
@Autowired
- private UserVehicleClient userVehicleClient;
+ private XpCruiseOrderClient xpCruiseOrderClient;
@Autowired
private XpVehicleClient xpVehicleClient;
@@ -769,11 +770,11 @@
lock.unlock();
continue;
}
- // 关闭巡游单子 TODO
-
+ // 关闭巡游单子
+ xpCruiseOrderClient.updateCruiseOrder(vehiclePosition.getVehicleVin());
PushOrderDto pushOrderDto = new PushOrderDto();
- pushOrderDto.setOrderId(xpOrder.getId());
+ pushOrderDto.setOrderId(xpOrder.getId().toString());
pushOrderDto.setVin(vehiclePosition.getVehicleVin());
@@ -806,11 +807,12 @@
lock.unlock();
continue;
}
- // 关闭巡游单子 TODO
+ // 关闭巡游单子
+ xpCruiseOrderClient.updateCruiseOrder(vehicleId1.getVehicleVin());
PushOrderDto pushOrderDto = new PushOrderDto();
- pushOrderDto.setOrderId(xpOrder.getId());
+ pushOrderDto.setOrderId(xpOrder.getId().toString());
pushOrderDto.setVin(vehiclePosition.getVin());
// 调用推送服务 orderId + carVin
@@ -879,10 +881,11 @@
lock.unlock();
continue;
}
- // 关闭巡游单子 TODO
+ // 关闭巡游单子
+ xpCruiseOrderClient.updateCruiseOrder(vehicleId1.getVehicleVin());
PushOrderDto pushOrderDto = new PushOrderDto();
- pushOrderDto.setOrderId(data.getId());
+ pushOrderDto.setOrderId(data.getId().toString());
pushOrderDto.setVin(vehiclePosition.getVin());
// 调用推送服务 orderId + carVin
orderMissionClient.pushOrder(pushOrderDto);
--
Gitblit v1.7.1