Merge remote-tracking branch 'origin/1.0' into 1.0

puzhibing

2026-05-18 d8440cc93f48e5a4b932d8daf740023e16d65008

 xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/service/impl/XpPricingServiceImpl.java

@@ -1182,6 +1182,7 @@
            pricingDto.setOpenCityId(routeAndFareDto.getOpenCityId());
            pricingDto.setUserCouponId(routeAndFareDto.getUserCouponId());
            pricingDto.setVehicleId(routeAndFareDto.getVehicleId());
            //计算导航对应的费用
            RouteAndFareVo part = pricingForRoute(pricingDto, routePoint, xpPricing, userId);
            RouteOptionVo opt = new RouteOptionVo();
            opt.setPathFingerprint(routePoint.getRouteID());
@@ -1494,8 +1495,8 @@
            for (int i = 0; i < queueItems.size(); i++) {
                currentPosition++;
                String item = queueItems.get(i);
                String[] split = item.split("-");
                if (split[1].equals(orderId + "")) {
                String[] split = item.split("_");
                if (split[0].equals(orderId + "")) {
                    break;
                }
            }