From b1aa3a40e6ba7d4591df50c679a2fa9aabf81759 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 12 五月 2026 15:56:07 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
index ff8ab49..2e17420 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
+++ b/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,24 +1888,24 @@
xpVehicleClient.updateVehicleById(vehicle1);
log.info("用户取消订单，车辆状态修改0 {}", xpVehicle.getPlateNumber());
}
+
+ //删除蓝牙秘钥
+ 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());
+ BluetoothDeliverVo vo = new BluetoothDeliverVo();
+ vo.setCredential(token);
+ vo.setVin(xpVehicle.getVehicleVin());
+ vo.setPassengerUid(order.getAppUserId());
+ BaseVehicleUserDto delete = bluetoothUnlockClient.delete(vo);
+ if (null == delete || delete.getCode() != 0) {
+ log.error("删除蓝牙解锁失败：{} {}", delete.getMsg(), order.getOrderNumber());
+ }
+ }
+
//车辆继续巡游
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());
- vo.setPassengerUid(order.getAppUserId());
- BaseVehicleUserDto delete = bluetoothUnlockClient.delete(vo);
- if (null == delete || delete.getCode() != 0) {
- log.error("删除蓝牙解锁失败：{} {}", delete.getMsg(), order.getOrderNumber());
- }
}
}else{
//流量接入-订单推送 推送取消订单
--
Gitblit v1.7.1