From d9cffa70b7e8f9dcc505c72e0fd87e9e553e7901 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期三, 18 三月 2026 19:35:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java b/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java
index aa2c412..11e93cd 100644
--- a/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java
+++ b/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java
@@ -567,7 +567,7 @@
RouteVo routeVo = routeVoR.getData();
routeID = routeVo.getRouteID();
//缓存导航数据，用于后面的逻辑中给乘客端推送导航数据
- redisService.setCacheObject("ORDER_NAVIGATION_END_DATA:" + xpOrder.getAppUserId(), com.alibaba.fastjson.JSON.toJSONString(routeVo), 24L, TimeUnit.HOURS);
+ redisService.setCacheObject("ORDER_NAVIGATION_END_DATA:" + xpOrder.getAppUserId(), JSON.toJSONString(routeVo), 24L, TimeUnit.HOURS);
}
vehicleId = xpOrder.getVehicleId();
}
@@ -685,7 +685,7 @@
RouteVo routeVo = routeVoR.getData();
routeID = routeVo.getRouteID();
//缓存导航数据，用于后面的逻辑中给乘客端推送导航数据
- redisService.setCacheObject("ORDER_NAVIGATION_END_DATA:" + xpOrder.getAppUserId(), com.alibaba.fastjson.JSON.toJSONString(routeVo), 24L, TimeUnit.HOURS);
+ redisService.setCacheObject("ORDER_NAVIGATION_END_DATA:" + xpOrder.getAppUserId(), JSON.toJSONString(routeVo), 24L, TimeUnit.HOURS);
}else{
RouteVo routeVo = JSON.parseObject(cacheObject.toString(), RouteVo.class);
routeID = routeVo.getRouteID();
@@ -859,8 +859,9 @@
case ORDER_CANCELLED:
//已取消
if(!orderId.contains("XU")){
- buildPushOrderStatus(orderId, OrderStatusEnum.CANCELED, sequence);
- xpOrderClient.updateOrderStatus(Long.parseLong(orderId), OrderStatusEnum.CANCELED.getCode());
+ //行程中取消订单，按照行程结束处理
+ buildPushOrderStatus(orderId, OrderStatusEnum.SEE_OFF_GUESTS, sequence);
+ xpOrderClient.updateOrderStatus(Long.parseLong(orderId), OrderStatusEnum.SEE_OFF_GUESTS.getCode());
}
break;
case ORDER_ARRIVED_AT_CRUISE_DESTINATION:
@@ -961,6 +962,7 @@
if (R.isError(stringR)) {
log.error("推送消息失败：{}", stringR.getMsg());
}
+
}
}
--
Gitblit v1.7.1