From 8fb7dde57b835463a6786a2e038f0ecd3dba827b Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 11 三月 2026 16:21:54 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 6 ++----
1 files changed, 2 insertions(+), 4 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 4f56628..d9a4138 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
@@ -872,7 +872,6 @@
}
XpCruiseOrder returnOrder = new XpCruiseOrder();
- returnOrder.setId("XU" + IdUtil.fastUUID());
returnOrder.setVehicleId(oldVehicle.getId());
returnOrder.setVehicleVin(oldVehicle.getVehicleVin());
returnOrder.setFleetId(oldVehicle.getFleetId());
@@ -916,7 +915,7 @@
// 下发巡游订单到原车辆
PushOrderDto pushOrderDto = new PushOrderDto();
pushOrderDto.setVin(oldVehicle.getVehicleVin());
- pushOrderDto.setOrderId(returnOrder.getId().toString());
+ pushOrderDto.setOrderId("XU" + returnOrder.getId());
pushOrderDto.setStartLatitude(returnOrder.getStartLat());
pushOrderDto.setStartLongitude(returnOrder.getStartLon());
pushOrderDto.setEndLatitude(returnOrder.getEndLat());
@@ -1793,7 +1792,6 @@
xpCruiseOrder.setStatus(0);
xpCruiseOrder.setLastOrderId(xpCruiseOrders.getId());
xpCruiseOrder.setCreateTime(LocalDateTime.now());
- xpCruiseOrder.setId("XU" + IdUtil.fastUUID());
// 判断当前时分秒是否大于收车时间
LocalTime vehicleCollectionTime = xpTaskRule.getVehicleCollectionTime();
@@ -1814,7 +1812,7 @@
// 添加自动结束行程定时任务job
Map<String, ? extends Object> jobMaps =
new ImmutableMap.Builder<String, String>().
- put("id", xpCruiseOrder.getId())
+ put("id", xpCruiseOrder.getId() + "")
.build();
QuartzManager.addJob(
AddCruiseMissionJob.class,
--
Gitblit v1.7.1