From f7675bda569bf0654b4157613c8ba448ac43c5a8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 06 三月 2026 17:11:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java |    7 +++----
 1 files changed, 3 insertions(+), 4 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 87edc32..ee4dc57 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
@@ -2128,10 +2128,9 @@
 
                 // Redis弹出这个队列元素
                 // value 订单Id_经纬度_状态_用户id_订单编号_距离_时间
-                String popFirstElement = redisService.popFirstElement(order.getQueueName());
+                redisService.popFirstElement(order.getQueueName());
                 XpGeoQueryEntity xpGeoQueryEntity = new XpGeoQueryEntity();
-                String[] split = popFirstElement.split("_");
-                xpGeoQueryEntity.setOrderId(split[0]);
+                xpGeoQueryEntity.setOrderId(order.getId().toString());
                 // 存mongo数据
                 xpPricingClient.updateXpGeoQueryEntity(order.getId().toString());
 
@@ -2150,7 +2149,7 @@
                 addTaxiPassengerVo.setAppId("");
                 userVehicleClient.addTaxiPassenger(addTaxiPassengerVo);
                 //推送乘客车辆到达预约点的导航数据
-                sendRoute(addTaxiPassengerVo.getUid(), orderId, "ORDER_NAVIGATION_START_DATA", dto.getXpVehicleVin());
+//                sendRoute(addTaxiPassengerVo.getUid(), orderId, "ORDER_NAVIGATION_START_DATA", dto.getXpVehicleVin());
             }else{
                 //推送行起点到终点的驶轨迹给乘客端
                 sendRoute(appUserId.toString(), orderId, "ORDER_NAVIGATION_END_DATA", dto.getXpVehicleVin());

--
Gitblit v1.7.1