Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi

liujie

2026-02-12 7487034d93586e722e414fb29eb58febe57eb6fc

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

@@ -797,10 +797,16 @@
                        DateUtils.localDateTimeToDate(LocalDateTime.now().plusMinutes(5)),
                        cancelJobMaps
                );
                // 车辆到达上车点时间
                xpOrder.setArrivalTime(LocalDateTime.now());
                break;
            case 5:
                // 删除定时任务job
                QuartzManager.removeJob((OrderCancelJob.name + xpOrder.getId()).toUpperCase(), TimeJobType.ORDER_CANCEL);
                break;
            case 6:
                // 行程开始时间
                xpOrder.setTripBegin(LocalDateTime.now());
                break;
            case 7:
                // 查询自动结束行程时间
@@ -819,7 +825,7 @@
                );
                break;
        }
        baseMapper.updateById(xpOrder);
        this.updateById(xpOrder);
        return R.ok();
    }