From c98d3f2fc620b3f5d699e2be34eaabc1033b42b2 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 11 三月 2026 16:17:32 +0800
Subject: [PATCH] 修改巡游订单部分逻辑

---
 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 d1ec250..9399092 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
@@ -871,7 +871,6 @@
             }
 
             XpCruiseOrder returnOrder = new XpCruiseOrder();
-            returnOrder.setId("XU" + IdUtil.fastUUID());
             returnOrder.setVehicleId(oldVehicle.getId());
             returnOrder.setVehicleVin(oldVehicle.getVehicleVin());
             returnOrder.setFleetId(oldVehicle.getFleetId());
@@ -915,7 +914,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());
@@ -1787,7 +1786,6 @@
         xpCruiseOrder.setStatus(0);
         xpCruiseOrder.setLastOrderId(xpCruiseOrders.getId());
         xpCruiseOrder.setCreateTime(LocalDateTime.now());
-        xpCruiseOrder.setId("XU" + IdUtil.fastUUID());
 
         // 判断当前时分秒是否大于收车时间
         LocalTime vehicleCollectionTime = xpTaskRule.getVehicleCollectionTime();
@@ -1808,7 +1806,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