From 6d32b9fdf20cea5c229fc18defc52348b47208ea Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 17 三月 2026 19:17:44 +0800
Subject: [PATCH] 修改bug
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
index 0bffe36..3d7dfcd 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
@@ -799,6 +799,10 @@
lock.lock(10, TimeUnit.SECONDS);
log.info("队列 {} 车辆 {} 单号 {}", quoteName, vehiclePositionVo.getVin(), orderNo);
try {
+
+
+
+
// VehiclePosition vehiclePosition = vehiclePositionService.findByVehicleId(vehiclePositionVo.getVehicle_id());
R<XpVehicle> vehiclePositionR = xpVehicleClient.findByVehicleVin(vehiclePositionVo.getVin());
if (vehiclePositionR.getCode() != 200) {
@@ -810,6 +814,18 @@
if (vehiclePosition.getOperatingStatus() != 1 || vehiclePosition.getState() != 0 || vehiclePosition.getVehicleType() == 1) {
continue;
}
+
+ // 再次查询一下订单 看是否取消
+ xpOrderR = xpOrderClient.queryOrderByOrderNo(orderNo);
+ if (xpOrderR.getCode() != 200) {
+ continue;
+ }
+ xpOrder = xpOrderR.getData();
+ if (xpOrder.getStatus() != 1) {
+ continue;
+ }
+
+
// 关闭巡游单子
R stringR = xpCruiseOrderClient.cancelCruiseOrderByVin(vehiclePosition.getVehicleVin());
if (stringR == null || stringR.getCode() != 200) {
@@ -859,6 +875,18 @@
if (vehicleId1.getOperatingStatus() != 1 || vehicleId1.getState() != 0 || vehicleId1.getVehicleType() == 1) {
continue;
}
+
+
+ // 再次查询一下订单 看是否取消
+ xpOrderR = xpOrderClient.queryOrderByOrderNo(orderNo);
+ if (xpOrderR.getCode() != 200) {
+ continue;
+ }
+ xpOrder = xpOrderR.getData();
+ if (xpOrder.getStatus() != 1) {
+ continue;
+ }
+
// 关闭巡游单子
R<?> stringR = xpCruiseOrderClient.cancelCruiseOrderByVin(vehicleId1.getVehicleVin());
if (stringR == null || stringR.getCode() != 200) {
--
Gitblit v1.7.1