修改bug

liujie

2026-03-05 db4418d74f244cfed177df1f9f832f5ee500be8b

修改bug

 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpRoutePlanServiceImpl.java

@@ -64,7 +64,6 @@
        routePlan.setCityCode(openCity.getCityCode());
        routePlan.setDistrictName(openCity.getDistrictName());
        routePlan.setDistrictCode(openCity.getDistrictCode());
        routePlan.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName());
        // 5. 保存到数据库
        this.save(routePlan);
    }
@@ -96,7 +95,7 @@
        routePlan.setCityCode(openCity.getCityCode());
        routePlan.setDistrictName(openCity.getDistrictName());
        routePlan.setDistrictCode(openCity.getDistrictCode());
        routePlan.setUpdateBy(SecurityUtils.getLoginUser().getSysUser().getNickName());
//        routePlan.setUpdateBy(SecurityUtils.getLoginUser().getSysUser().getNickName());
        // 5. 保存更新
        this.updateById(routePlan);
    }

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

@@ -211,7 +211,12 @@
        // 最终没找到车
//        redisService.popFirstElement(quoteName);
        // 取消订单
        xpOrderClient.cancelOrder(orderId);
        R<XpOrder> xpOrderR = xpOrderClient.queryOrderById(Long.valueOf(orderId));
        if(xpOrderR.getCode()==200){
            if (xpOrderR.getData().getStatus()==1) {
                xpOrderClient.cancelOrder(orderId);
            }
        }

    }


 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/job/jobs/OrderCancelJob.java

@@ -35,7 +35,7 @@
        try {
            log.info("开始执行订单取消任务");
            XpOrder xpOrder = xpOrderService.getById(orderId);
            if(Objects.nonNull(xpOrder)){
            if(Objects.nonNull(xpOrder) && xpOrder.getStatus()==4){
                log.info("订单取消开始");
                xpOrderService.cancelOrder(String.valueOf(xpOrder.getId()));
                log.info("订单取消状态修改完成");

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

@@ -1161,6 +1161,7 @@
                xpOrder.setArrivalTime(LocalDateTime.now());
                break;
            case 5:
                xpOrder.setBoardingTime(LocalDateTime.now());
                // 删除定时任务job
                QuartzManager.removeJob((OrderCancelJob.name + xpOrder.getId()).toUpperCase(), TimeJobType.ORDER_CANCEL);
                break;