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

yyy

2026-05-06 b59bca62353f93424818a4dd39068b10948c5267

 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java

@@ -1102,8 +1102,8 @@
                            orderMissionClient.pushOrder(pushOrderDto);
                            log.info("开始推送 {} 订单到XPU。单号 {}", xpOrder.getOrderNumber(), orderNo);
                        }else {
                            //合作商的车辆需要调用合作商的订单通知接口
                            officialPartnerUtil.pusNewOrder(vehiclePosition.getOfficialPartnerId(), xpOrder);
                            //流量接入-接单推送 合作商的车辆需要调用合作商的订单通知接口
                            officialPartnerUtil.pushNewOrder(vehiclePosition.getOfficialPartnerId(), xpOrder);
                        }
                        redisService.removeByPattern(quoteName,xpOrder.getOrderNumber());
                        log.info("将订单 {} 从队列 {} 弹出去", orderNo, quoteName);
@@ -1166,8 +1166,8 @@
                            // 调用推送服务  orderId + carVin
                            orderMissionClient.pushOrder(pushOrderDto);
                        }else {
                            //合作商的车辆需要调用合作商的订单通知接口
                            officialPartnerUtil.pusNewOrder(vehicleId1.getOfficialPartnerId(), xpOrder);
                            //流量接入-接单推送 合作商的车辆需要调用合作商的订单通知接口
                            officialPartnerUtil.pushNewOrder(vehicleId1.getOfficialPartnerId(), xpOrder);
                        }
                        log.info("开始推送 {} 订单到XPU", xpOrder.getOrderNumber());
                        redisService.popFirstElement(quoteName);