liujie
2026-05-12 b1aa3a40e6ba7d4591df50c679a2fa9aabf81759
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -1877,8 +1877,7 @@
                BaseVehicleUserDto baseVehicleUserDto = userVehicleClient.cancelTaxiPassenger(cancelTaxiPassengerVo);
                if (baseVehicleUserDto == null) {
                    // TODO 本地无法调通
//            throw new RuntimeException("取消订单失败");
                    throw new RuntimeException("取消订单失败");
                }
                //还原车辆状态
@@ -1889,16 +1888,12 @@
                    xpVehicleClient.updateVehicleById(vehicle1);
                    log.info("用户取消订单,车辆状态修改0 {}", xpVehicle.getPlateNumber());
                }
                //车辆继续巡游
                addCruiseMission(order, status);
            }
            //删除蓝牙秘钥
            String token = redisService.getCacheObject("rt:bluetooth:unlock:order:" + order.getId());
            if (StringUtils.isNotBlank(token)) {
                redisService.deleteObject("rt:bluetooth:unlock:" + token);
                redisService.deleteObject("rt:bluetooth:unlock:order:" + order.getId());
                XpVehicle xpVehicle = xpVehicleClient.queryById(order.getVehicleId()).getData();
                BluetoothDeliverVo vo = new BluetoothDeliverVo();
                vo.setCredential(token);
                vo.setVin(xpVehicle.getVehicleVin());
@@ -1908,6 +1903,10 @@
                    log.error("删除蓝牙解锁失败:{} {}", delete.getMsg(), order.getOrderNumber());
                }
            }
                //车辆继续巡游
                addCruiseMission(order, status);
            }
        }else{
            //流量接入-订单推送 推送取消订单
            officialPartnerUtil.pushCancelOrder(order.getOfficialPartnerId(), xpOrderCancel, order.getStatus());