From 3a0557f4c73ea4a13260f8d46e82e2bf5d94291e Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 06 三月 2026 19:46:16 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 ee4dc57..728eaed 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
@@ -1234,7 +1234,7 @@
order.setStatus(8);
order.setAppUserId(null);
order.setTripEnd(LocalDateTime.now());
- order.setMileageKilometers(80.0);
+// order.setMileageKilometers(80.0);
baseMapper.updateById(order);
// 解绑用户与车辆关系
CancelTaxiPassengerVo cancelTaxiPassengerVo = new CancelTaxiPassengerVo();
@@ -2128,7 +2128,11 @@
// Redis弹出这个队列元素
// value 订单Id_经纬度_状态_用户id_订单编号_距离_时间
- redisService.popFirstElement(order.getQueueName());
+ try {
+ redisService.popFirstElement(order.getQueueName());
+ }catch (Exception e){
+ log.error("Redis弹出队列元素出错");
+ }
XpGeoQueryEntity xpGeoQueryEntity = new XpGeoQueryEntity();
xpGeoQueryEntity.setOrderId(order.getId().toString());
// 存mongo数据
@@ -2149,7 +2153,7 @@
addTaxiPassengerVo.setAppId("");
userVehicleClient.addTaxiPassenger(addTaxiPassengerVo);
//推送乘客车辆到达预约点的导航数据
-// sendRoute(addTaxiPassengerVo.getUid(), orderId, "ORDER_NAVIGATION_START_DATA", dto.getXpVehicleVin());
+ sendRoute(addTaxiPassengerVo.getUid(), orderId, "ORDER_NAVIGATION_START_DATA", dto.getXpVehicleVin());
}else{
//推送行起点到终点的驶轨迹给乘客端
sendRoute(appUserId.toString(), orderId, "ORDER_NAVIGATION_END_DATA", dto.getXpVehicleVin());
--
Gitblit v1.7.1