From 6f55da80d19cba61bd23cd302b76bbb23038f7bd Mon Sep 17 00:00:00 2001
From: yyy <1083599556@qq.com>
Date: 星期二, 21 四月 2026 12:03:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java | 5 +++++
1 files changed, 5 insertions(+), 0 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 0db49f8..b192bcc 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
@@ -347,6 +347,7 @@
// 下发XPU命令
PushOrderDto pushOrderDto = new PushOrderDto();
pushOrderDto.setVin(priorityVin);
+ pushOrderDto.setTaskId(orderCheck.getData().getXpuTaskId());
pushOrderDto.setOrderId(orderCheck.getData().getId().toString());
pushOrderDto.setStartLatitude(orderCheck.getData().getStartLat());
pushOrderDto.setStartLongitude(orderCheck.getData().getStartLon());
@@ -1009,6 +1010,7 @@
log.info("关闭巡游单成功 {} {}", vehiclePosition.getPlateNumber(), orderNo);
// 下发命令
PushOrderDto pushOrderDto = new PushOrderDto();
+ pushOrderDto.setTaskId(xpOrder.getXpuTaskId());
pushOrderDto.setVin(vehiclePosition.getVehicleVin());
pushOrderDto.setOrderId(xpOrder.getId().toString());
pushOrderDto.setStartLatitude(xpOrder.getStartLat());
@@ -1071,6 +1073,7 @@
log.info("关闭巡游单成功 {} {}", vehicleId1.getPlateNumber(), orderNo);
PushOrderDto pushOrderDto = buildPushOrderDto(xpOrder);
pushOrderDto.setVin(vehiclePosition.getVin());
+ pushOrderDto.setTaskId(xpOrder.getXpuTaskId());
// 调用推送服务 orderId + carVin
orderMissionClient.pushOrder(pushOrderDto);
log.info("开始推送 {} 订单到XPU", xpOrder.getOrderNumber());
@@ -1154,6 +1157,7 @@
routeToOrigin.setDistance(routeToOrigin.getDistance() + routeRemain.getDistance());
PushOrderDto pushOrderDto = buildPushOrderDto(xpOrder);
pushOrderDto.setVin(xpVehicle.getVehicleVin());
+ pushOrderDto.setTaskId(xpOrder.getXpuTaskId());
// 订单流转
orderMissionClient.pushOrder(pushOrderDto);
redisService.setCacheObject(CacheConstants.nextOrder(luckyOder.getId().toString()), xpOrder.getId());
@@ -1333,6 +1337,7 @@
}
PushOrderDto pushOrderDto = new PushOrderDto();
+ pushOrderDto.setTaskId(data.getXpuTaskId());
pushOrderDto.setVin(vehiclePosition.getVin());
pushOrderDto.setOrderId(data.getId().toString());
pushOrderDto.setStartLatitude(data.getStartLat());
--
Gitblit v1.7.1