From 4c5d99fd2e9c264ebf7cfb532fae430fb6f7f66b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 29 四月 2026 20:23:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 64 ++++++++++++++++---------------
1 files changed, 33 insertions(+), 31 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 53023d0..eee0f3b 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
@@ -3579,34 +3579,34 @@
.plusMinutes(routeVo1.getDuration()).plusMinutes(endPoint.getParkingTimeLimit()).plusMinutes(30);
long expirationTime = localDateTime.toEpochSecond(ZoneOffset.of("+8"));
//生成token
- String token = bluetoothUnlockTokenUtil.generateBluetoothUnlockToken(order.getAppUserId(),
- order.getId(), order.getVehicleId(), expirationTime);
- log.info("生成蓝牙token：{} 有效期：{} 订单号： {}", token, expirationTime, order.getOrderNumber());
- //存储缓存
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("userId", order.getAppUserId());
- jsonObject.put("orderId", order.getId());
- jsonObject.put("vehicleId", order.getVehicleId());
- jsonObject.put("expirationTime", expirationTime);
- jsonObject.put("orderNumber", order.getOrderNumber());
- jsonObject.put("vehicleVin", vehicle.getVehicleVin());
- jsonObject.put("createTime", System.currentTimeMillis());
- redisService.setCacheObject("rt:bluetooth:unlock:" + token, jsonObject.toJSONString(), expirationTime, TimeUnit.SECONDS);
- redisService.setCacheObject("rt:bluetooth:unlock:order:" + order.getId(), token, expirationTime, TimeUnit.SECONDS);
- //开始下发蓝牙token
- BluetoothDeliverVo vo = new BluetoothDeliverVo();
- vo.setCredential(token);
- vo.setVim(vehicle.getVehicleVin());
- vo.setPassengerUid(order.getAppUserId());
- BaseVehicleUserDto deliver = bluetoothUnlockClient.deliver(vo);
- if(null == deliver){
- throw new ServiceException("下发蓝牙token失败");
- }
- if(deliver.getCode() != 0){
- log.error("下发蓝牙token失败：{} {}", deliver.getMsg(), order.getOrderNumber());
- throw new ServiceException(deliver.getMsg());
- }
- log.info("下发蓝牙token成功：{} {}", deliver.getData(), order.getOrderNumber());
+// String token = bluetoothUnlockTokenUtil.generateBluetoothUnlockToken(order.getAppUserId(),
+// order.getId(), order.getVehicleId(), expirationTime);
+// log.info("生成蓝牙token：{} 有效期：{} 订单号： {}", token, expirationTime, order.getOrderNumber());
+// //存储缓存
+// JSONObject jsonObject = new JSONObject();
+// jsonObject.put("userId", order.getAppUserId());
+// jsonObject.put("orderId", order.getId());
+// jsonObject.put("vehicleId", order.getVehicleId());
+// jsonObject.put("expirationTime", expirationTime);
+// jsonObject.put("orderNumber", order.getOrderNumber());
+// jsonObject.put("vehicleVin", vehicle.getVehicleVin());
+// jsonObject.put("createTime", System.currentTimeMillis());
+// redisService.setCacheObject("rt:bluetooth:unlock:" + token, jsonObject.toJSONString(), expirationTime, TimeUnit.SECONDS);
+// redisService.setCacheObject("rt:bluetooth:unlock:order:" + order.getId(), token, expirationTime, TimeUnit.SECONDS);
+// //开始下发蓝牙token
+// BluetoothDeliverVo vo = new BluetoothDeliverVo();
+// vo.setCredential(token);
+// vo.setVim(vehicle.getVehicleVin());
+// vo.setPassengerUid(order.getAppUserId());
+// BaseVehicleUserDto deliver = bluetoothUnlockClient.deliver(vo);
+// if(null == deliver){
+// throw new ServiceException("下发蓝牙token失败");
+// }
+// if(deliver.getCode() != 0){
+// log.error("下发蓝牙token失败：{} {}", deliver.getMsg(), order.getOrderNumber());
+// throw new ServiceException(deliver.getMsg());
+// }
+// log.info("下发蓝牙token成功：{} {}", deliver.getData(), order.getOrderNumber());
}
if(order.getStatus() == 2){
@@ -3792,9 +3792,11 @@
}
Integer status = xpOrder.getStatus();
if(status > 2 && status < 8){
- Boolean data = xpVehicleClient.getVehicleTrunkOpenStatus(xpOrder.getAppUserId(), xpOrder.getVehicleId()).getData();
- xpOrder.setOpenTrunk(data ? 1 : 2);
- xpOrderDetailVO.setOpenTrunk(data ? 1 : 2);
+// Boolean data = xpVehicleClient.getVehicleTrunkOpenStatus(xpOrder.getAppUserId(), xpOrder.getVehicleId()).getData();
+// xpOrder.setOpenTrunk(data ? 1 : 2);
+// xpOrderDetailVO.setOpenTrunk(data ? 1 : 2);
+ xpOrder.setOpenTrunk(2);
+ xpOrderDetailVO.setOpenTrunk(2);
xpOrder.setAppUserId(null);
this.updateById(xpOrder);
}
--
Gitblit v1.7.1