From b1f26aebe882d31df351f875d59eefc946aee295 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 27 二月 2026 12:30:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 e1c01e6..e7aabb9 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
@@ -1216,8 +1216,10 @@
// 结束后的车辆操作
if(vehicle!=null){
// 生成新的巡游单子 回到最新巡游的初始起点位置
- XpCruiseOrder xpCruiseOrders = xpCruiseOrderMapper.selectOne(new LambdaQueryWrapper<XpCruiseOrder>().eq(XpCruiseOrder::getVehicleId, vehicle.getId()).eq(XpCruiseOrder::getStatus, 2).orderByDesc(BaseModel::getCreateTime).last("limit 1")); XpCruiseOrder xpCruiseOrder = new XpCruiseOrder();
+ XpCruiseOrder xpCruiseOrders = xpCruiseOrderMapper.selectOne(new LambdaQueryWrapper<XpCruiseOrder>().eq(XpCruiseOrder::getVehicleId, vehicle.getId()).eq(XpCruiseOrder::getStatus, 2).orderByDesc(BaseModel::getCreateTime).last("limit 1"));
+ XpCruiseOrder xpCruiseOrder = new XpCruiseOrder();
xpCruiseOrder.setVehicleId(vehicle.getId());
+ xpCruiseOrder.setFleetId(vehicle.getFleetId());
xpCruiseOrder.setVehicleVin(vehicle.getVehicleVin());
xpCruiseOrder.setOrderType(2);
// 返程起点是当前正常订单的终点
@@ -1682,6 +1684,7 @@
if (byVehicleVin.getCode() == 200) {
vehicle = byVehicleVin.getData();
order.setVehicleId(vehicle.getId());
+ order.setFleetId(vehicle.getFleetId());
addTaxiPassengerVo.setVin(vehicle.getVehicleVin());
}
order.setStatus(2);
--
Gitblit v1.7.1