From b7bb5daa5f4ffe1764a363a051a5d6f868168cf9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 五月 2026 20:56:31 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.1
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpTestOrderServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpTestOrderServiceImpl.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpTestOrderServiceImpl.java
index 13af90e..23ae882 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpTestOrderServiceImpl.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpTestOrderServiceImpl.java
@@ -51,9 +51,8 @@
import com.xiaopeng.order.job.base.QuartzManager;
import com.xiaopeng.order.job.base.TimeJobType;
import com.xiaopeng.order.job.jobs.EndTripJob;
-import com.xiaopeng.order.job.jobs.OrderCancelJob;
import com.xiaopeng.order.job.jobs.TestOrderCancelJob;
-import com.xiaopeng.order.mangodb.model.OrderTrajectory;
+import com.xiaopeng.api.model.order.OrderTrajectory;
import com.xiaopeng.order.mapper.XpCruiseOrderMapper;
import com.xiaopeng.order.mapper.XpTestOrderDetailMapper;
import com.xiaopeng.order.mapper.XpTestOrderMapper;
@@ -276,6 +275,8 @@
pushOrderDto.setEndTaskId(xpOrder.getXpuEndTaskId());
pushOrderDto.setVin(xpVehicle.getVehicleVin());
pushOrderDto.setOrderId("TEST" + xpOrder.getId());
+ pushOrderDto.setStartWaypointId(xpOrder.getStartTestPointId());
+ pushOrderDto.setEndWaypointId(xpOrder.getEndTestPointId());
pushOrderDto.setStartLatitude(xpOrder.getStartLat());
pushOrderDto.setStartLongitude(xpOrder.getStartLon());
pushOrderDto.setEndLatitude(xpOrder.getEndLat());
@@ -839,6 +840,8 @@
pushOrderDto.setEndTaskId(order.getXpuEndTaskId());
pushOrderDto.setVin(newVehicle.getVehicleVin());
pushOrderDto.setOrderId("TEST" + order.getId());
+ pushOrderDto.setStartWaypointId(order.getStartTestPointId());
+ pushOrderDto.setEndWaypointId(order.getEndTestPointId());
pushOrderDto.setStartLatitude(order.getStartLat());
pushOrderDto.setStartLongitude(order.getStartLon());
pushOrderDto.setEndLatitude(order.getEndLat());
--
Gitblit v1.7.1