Merge remote-tracking branch 'origin/master'

puzhibing

2026-03-01 5ee919212a6e96bc64f9ef3eb0adaeb474743c4e

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java

 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java

@@ -2010,7 +2010,7 @@
                String[] split = popFirstElement.split("_");
                xpGeoQueryEntity.setOrderId(split[0]);
                // 存mongo数据
                xpPricingClient.updateXpGeoQueryEntity(split[0]);
                xpPricingClient.updateXpGeoQueryEntity(order.getId().toString());


                // 修改车辆信息
@@ -2027,7 +2027,7 @@
                addTaxiPassengerVo.setAppId("");
                userVehicleClient.addTaxiPassenger(addTaxiPassengerVo);
                //推送乘客车辆到达预约点的导航数据
                sendRoute(appUserId.toString(), 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());