Merge remote-tracking branch 'origin/master'

xuhy

2026-02-28 bfa3d56a75599d8b9861e44a5baf3c2a733287c2

Merge remote-tracking branch 'origin/master'

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/vehicleConvoy/XpVehicleAnnualRecord.java

@@ -64,4 +64,5 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime qualificationExpireTime;


}

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

@@ -941,6 +941,11 @@
        if (order.getStatus() > 5 || order.getStatus() < 1) {
            throw new ServiceException("订单状态错误",I18nKeyConstant.ORDER_STATUS_ERROR);
        }
        if(order.getStatus()==1){
            order.setStatus(0);
            baseMapper.updateById(order);
            return;
        }
        order.setStatus(0);

        // 组装调用车机参数