From 560be817c1342d4da523760ba38433c4c0f52983 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 12 五月 2026 10:56:09 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.1
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/ActiveOrderController.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/ActiveOrderController.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/ActiveOrderController.java
index d90a7ca..d7e42de 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/ActiveOrderController.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/ActiveOrderController.java
@@ -100,6 +100,9 @@
key = "ORDER_NAVIGATION_END_DATA:" + xpOrder.getAppUserId();
}
Object cacheObject = redisService.getCacheObject(key);
+ if(cacheObject == null){
+ return R.fail("获取路线失败");
+ }
RouteVo routeVo = JSON.parseObject(cacheObject.toString(), RouteVo.class);
XpVehicle xpVehicle = xpVehicleClient.queryById(xpOrder.getVehicleId()).getData();
VehiclePosition vehiclePosition = mongoTemplate.findOne(new Query(Criteria.where("vin").is(xpVehicle.getVehicleVin())), VehiclePosition.class);
@@ -162,6 +165,7 @@
xpOrderDetailVO.setVehicleId(vehicle.getId());
xpOrderDetailVO.setVehicleVin(vehicle.getVehicleVin());
xpOrderDetailVO.setVehicleModel(vehicle.getVehicleModelName());
+ xpOrderDetailVO.setVehicleCode(vehicle.getVehicleCode());
xpOrderDetailVO.setVehicleColor(vehicle.getVehicleColor());
xpOrderDetailVO.setPlateNumber(vehicle.getPlateNumber());
xpOrderDetailVO.setVehiclePictures(vehicle.getVehiclePictures());
--
Gitblit v1.7.1