From 43f10a422efd983a5f806db2f20520ebe1414cae Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 五月 2026 13:47:38 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
index 1dc0d10..36d3c2c 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -1190,6 +1190,8 @@
pushOrderDto.setEndTaskId(order.getXpuEndTaskId());
pushOrderDto.setVin(newVehicle.getVehicleVin());
pushOrderDto.setOrderId(order.getId().toString());
+ pushOrderDto.setStartWaypointId(order.getStartPointId());
+ pushOrderDto.setEndWaypointId(order.getEndPointId());
pushOrderDto.setStartLatitude(order.getStartLat());
pushOrderDto.setStartLongitude(order.getStartLon());
pushOrderDto.setEndLatitude(order.getEndLat());
@@ -1325,6 +1327,8 @@
pushOrderDto.setEndTaskId(returnOrder.getXpuTaskId());
pushOrderDto.setVin(oldVehicle.getVehicleVin());
pushOrderDto.setOrderId("XU" + returnOrder.getId());
+ pushOrderDto.setStartWaypointId(returnOrder.getStartPointId());
+ pushOrderDto.setEndWaypointId(returnOrder.getEndPointId());
pushOrderDto.setStartLatitude(returnOrder.getStartLat());
pushOrderDto.setStartLongitude(returnOrder.getStartLon());
pushOrderDto.setEndLatitude(returnOrder.getEndLat());
@@ -2892,6 +2896,8 @@
pushOrderDto.setEndTaskId(xpCruiseOrder.getXpuTaskId());
pushOrderDto.setVin(xpCruiseOrder.getVehicleVin());
pushOrderDto.setOrderId("XU" + xpCruiseOrder.getId());
+ pushOrderDto.setStartWaypointId(xpCruiseOrder.getStartPointId());
+ pushOrderDto.setEndWaypointId(xpCruiseOrder.getEndPointId());
pushOrderDto.setStartLatitude(xpCruiseOrder.getStartLat());
pushOrderDto.setStartLongitude(xpCruiseOrder.getStartLon());
pushOrderDto.setEndLatitude(xpCruiseOrder.getEndLat());
@@ -3012,6 +3018,8 @@
pushOrderDto.setEndTaskId(xpCruiseOrder.getXpuTaskId());
pushOrderDto.setVin(xpCruiseOrder.getVehicleVin());
pushOrderDto.setOrderId("XU" + xpCruiseOrder.getId());
+ pushOrderDto.setStartWaypointId(xpCruiseOrder.getStartPointId());
+ pushOrderDto.setEndWaypointId(xpCruiseOrder.getEndPointId());
pushOrderDto.setStartLatitude(xpCruiseOrder.getStartLat());
pushOrderDto.setStartLongitude(xpCruiseOrder.getStartLon());
pushOrderDto.setEndLatitude(xpCruiseOrder.getEndLat());
--
Gitblit v1.7.1