From 9da37c2c81926ac5c05e9aaf28036df1e858feee Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期六, 14 三月 2026 17:38:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 c3d0cd0..58af009 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
@@ -964,6 +964,7 @@
returnOrder.setEndPointName(lastCruise.getStartPointName());
returnOrder.setEndLon(lastCruise.getStartLon());
returnOrder.setEndLat(lastCruise.getStartLat());
+ returnOrder.setOrderReverse(lastCruise.getOrderReverse());
log.info("巡游订单状态为已终止，返回原出发点");
} else if (lastCruise.getStatus() != null && lastCruise.getStatus() == 3) {
// 已完成(status=3) -> 返回原终点
@@ -971,6 +972,7 @@
returnOrder.setEndPointName(lastCruise.getEndPointName());
returnOrder.setEndLon(lastCruise.getEndLon());
returnOrder.setEndLat(lastCruise.getEndLat());
+ returnOrder.setOrderReverse(lastCruise.getOrderReverse());
log.info("巡游订单状态为已完成，返回原终点");
} else {
// 其他状态（进行中等），默认返回原出发点
@@ -978,6 +980,7 @@
returnOrder.setEndPointName(lastCruise.getStartPointName());
returnOrder.setEndLon(lastCruise.getStartLon());
returnOrder.setEndLat(lastCruise.getStartLat());
+ returnOrder.setOrderReverse(lastCruise.getOrderReverse());
log.info("巡游订单状态为{}，默认返回原出发点", lastCruise.getStatus());
}
@@ -1962,11 +1965,13 @@
public void addCruiseMission(XpVehicle vehicle, XpOrder order) {
if (vehicle.getState() != 0 || vehicle.getOperatingStatus() != 1) {
+ log.info("添加巡游单失败，车辆状态限制 {}", vehicle.getState());
return;
}
// 判断是否有计划
R<XpCruisePlanVehicle> xpCruisePlanR = xpCruisePlanClient.getCruisePlan(vehicle.getId());
if (xpCruisePlanR == null || xpCruisePlanR.getData() == null) {
+ log.info("添加巡游单失败，没有符合条件的巡游计划", vehicle.getPlateNumber());
return;
}
// 获取配置 根据配置判断是否该收车 如果是则找到收车点位进行收车操作
@@ -2027,11 +2032,7 @@
xpCruiseOrder.setMissionId(xpCruisePlanPoint.getCruisePlanId());
xpCruiseOrder.setOrderReverse(1);
}
-
-
-
xpCruiseOrder.setStatus(0);
- xpCruiseOrder.setLastOrderId(xpCruiseOrders.getId());
xpCruiseOrder.setCreateTime(LocalDateTime.now());
// 判断当前时分秒是否大于收车时间
@@ -2631,11 +2632,10 @@
XpCruiseOrder xpCruiseOrder = xpCruiseOrderMapper.selectById(orderId);
if (xpCruiseOrder != null) {
xpCruiseOrder.setStatus(1);
+ xpCruiseOrder.setVehicleId(null);
xpCruiseOrderMapper.updateById(xpCruiseOrder);
log.info("修改巡游单状态，开始执行巡游单 {}", dto.getOrderId());
}
-
-
}
//乘客单处理逻辑
if (OrderType.USER_ORDER.equals(orderType)) {
--
Gitblit v1.7.1