From 65cc684c4c1f4a2d028d4ed5b92994f17492401e Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 三月 2026 18:19:37 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi

---
 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java |   12 ++++++++++++
 1 files changed, 12 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 09ae2f0..bd33ff4 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
@@ -2,6 +2,7 @@
 
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.xiaopeng.api.dto.automaticPilot.PushOrderDto;
 import com.xiaopeng.api.dto.map.RouteAndFareDto;
 import com.xiaopeng.api.dto.operation.LonLatDto;
@@ -836,6 +837,17 @@
                         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;
                     } catch (Exception e) {
                         e.printStackTrace();

--
Gitblit v1.7.1