From 234a2cef26c51478b9616882ee6f74e804c7f9fc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 10 三月 2026 14:36:40 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java | 13 +------------
1 files changed, 1 insertions(+), 12 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 fb7888d..5000456 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
@@ -842,7 +842,7 @@
} else {
// 直接派单 定义一个锁来锁定车辆
- VehiclePosition vehiclePosition = positionList.get(0);
+ VehiclePositionVo vehiclePosition = availableVehiclesNearby.get(0);
String vehicleVin = vehiclePosition.getVin();
RLock lock = redissonClient.getLock("FIND_CAR_" + vehiclePosition.getVin());
@@ -880,17 +880,6 @@
log.info("开始推送 {} 订单到XPU", xpOrder.getOrderNumber());
redisService.popFirstElement(quoteName);
log.info("将订单 {} 从队列 {} 弹出去", orderNo, quoteName);
- //判断还原车辆状态
- Object cacheObject = redisService.getCacheObject("CREATE_ORDER:" + xpOrder.getId().toString());
- if (null != cacheObject) {
- JSONObject jsonObject = JSON.parseObject(cacheObject.toString());
- String vin = jsonObject.getString("vin");
- XpVehicle vehicle = xpVehicleClient.findByVehicleVin(vin).getData();
- if (null != vehicle && 0 != vehicle.getState()) {
- vehicle.setState(0);
- xpVehicleClient.updateVehicleById(vehicle);
- }
- }
return true;
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.7.1