Merge remote-tracking branch 'origin/master'

puzhibing

2026-02-25 60a69aaa6ce99243ca8379cebf2b15ee8fa87eb1

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

@@ -8,6 +8,7 @@
import com.xiaopeng.api.dto.vehicleConvoy.BaseVehicleUserDto;
import com.xiaopeng.api.feignClient.automaticPilot.OrderMissionClient;
import com.xiaopeng.api.feignClient.map.XpMapClient;
import com.xiaopeng.api.feignClient.order.XpCruiseOrderClient;
import com.xiaopeng.api.feignClient.order.XpOrderClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.UserVehicleClient;
import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
@@ -65,7 +66,7 @@
    private IXpTradingStrategyService xpTradingStrategyService;

    @Autowired
    private UserVehicleClient userVehicleClient;
    private XpCruiseOrderClient xpCruiseOrderClient;

    @Autowired
    private XpVehicleClient xpVehicleClient;
@@ -769,11 +770,11 @@
                            lock.unlock();
                            continue;
                        }
                        //  关闭巡游单子 TODO

                        //  关闭巡游单子
                        xpCruiseOrderClient.updateCruiseOrder(vehiclePosition.getVehicleVin());

                        PushOrderDto pushOrderDto = new PushOrderDto();
                        pushOrderDto.setOrderId(xpOrder.getId());
                        pushOrderDto.setOrderId(xpOrder.getId().toString());
                        pushOrderDto.setVin(vehiclePosition.getVehicleVin());


@@ -806,11 +807,12 @@
                            lock.unlock();
                            continue;
                        }
                        //  关闭巡游单子 TODO
                        //  关闭巡游单子
                        xpCruiseOrderClient.updateCruiseOrder(vehicleId1.getVehicleVin());


                        PushOrderDto pushOrderDto = new PushOrderDto();
                        pushOrderDto.setOrderId(xpOrder.getId());
                        pushOrderDto.setOrderId(xpOrder.getId().toString());
                        pushOrderDto.setVin(vehiclePosition.getVin());

                        // 调用推送服务  orderId + carVin
@@ -879,10 +881,11 @@
                    lock.unlock();
                    continue;
                }
                //  关闭巡游单子 TODO
                //  关闭巡游单子
                xpCruiseOrderClient.updateCruiseOrder(vehicleId1.getVehicleVin());

                PushOrderDto pushOrderDto = new PushOrderDto();
                pushOrderDto.setOrderId(data.getId());
                pushOrderDto.setOrderId(data.getId().toString());
                pushOrderDto.setVin(vehiclePosition.getVin());
                // 调用推送服务  orderId + carVin
                orderMissionClient.pushOrder(pushOrderDto);