From bfe14c42d806ef369993940573245b954fddfc8e Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期三, 25 二月 2026 16:54:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java |   39 +++++++++++++++++++++------------------
 1 files changed, 21 insertions(+), 18 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 c017bdb..7107b7b 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
@@ -1666,25 +1666,28 @@
         // TODO appid
         addTaxiPassengerVo.setAppId("");
 
+
+        // Redis弹出这个队列元素
+        // value 订单Id_经纬度_状态_用户id_订单编号_距离_时间
+        String popFirstElement = redisService.popFirstElement(order.getQueueName());
+        XpGeoQueryEntity xpGeoQueryEntity = new XpGeoQueryEntity();
+        String[] split = popFirstElement.split("_");
+        xpGeoQueryEntity.setOrderId(split[0]);
+        // 存mongo数据
+        xpPricingClient.updateXpGeoQueryEntity(split[0]);
+        this.updateById(order);
+
+        // 修改车辆信息
+        vehicle.setState(1);
+        xpVehicleClient.updateVehicleById(vehicle);
+
+
+
+        // 推送点位轨迹信息
+
+
+        // 绑定关系
         BaseVehicleUserDto baseVehicleUserDto = userVehicleClient.addTaxiPassenger(addTaxiPassengerVo);
-        if (baseVehicleUserDto.getCode() == 200) {
-
-            // Redis弹出这个队列元素
-            // value 订单Id_经纬度_状态_用户id_订单编号_距离_时间
-            String popFirstElement = redisService.popFirstElement(order.getQueueName());
-            XpGeoQueryEntity xpGeoQueryEntity = new XpGeoQueryEntity();
-            String[] split = popFirstElement.split("_");
-            xpGeoQueryEntity.setOrderId(split[0]);
-            // 存mongo数据
-            xpPricingClient.updateXpGeoQueryEntity(split[0]);
-            this.updateById(order);
-
-            // 修改车辆信息
-            vehicle.setState(1);
-            xpVehicleClient.updateVehicleById(vehicle);
-
-
-        }
     }
 
 

--
Gitblit v1.7.1