From 46342ddcf5d52ccbf2ae8d8a9a0b14cc0d29b250 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 16 四月 2026 22:14:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java | 23 +----------------------
1 files changed, 1 insertions(+), 22 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 5f5c3e9..d81cf34 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
@@ -443,7 +443,7 @@
// 给连环派单的用户推送
Long nextOrderId = redisService.getCacheObject(CacheConstants.nextOrder(order_id));
if (null != nextOrderId){
- dto.setOrderId(orderId);
+ dto.setOrderId(nextOrderId);
xpPushMessageClient.pushOrderRoute(dto);
}
xpOrderClient.saveVehicleLocation(orderTrajectory);
@@ -1202,26 +1202,6 @@
log.info("到达目的地，不做任何处理：{}", orderId);
break;
case ORDER_WAITING_FOR_DROPOFF:
- Long id = redisService.getCacheObject(CacheConstants.nextOrder(orderId));
- if(id != null){
- scheduler.schedule(() -> {
- XpOrder xpOrder = xpOrderClient.queryOrderById(id).getData();
- XpVehicle xpVehicle = xpVehicleClient.queryById(xpOrder.getVehicleId()).getData();
- PushOrderDto pushOrderDto = new PushOrderDto();
- pushOrderDto.setOrderId(xpOrder.getId().toString());
- pushOrderDto.setStartLatitude(xpOrder.getStartLat());
- pushOrderDto.setStartLongitude(xpOrder.getStartLon());
- pushOrderDto.setEndLatitude(xpOrder.getEndLat());
- pushOrderDto.setEndLongitude(xpOrder.getEndLon());
- pushOrderDto.setEndPoiName(xpOrder.getEndPointName());
- pushOrderDto.setOrderType(OrderType.USER_ORDER);
- pushOrderDto.setStage(1);
- pushOrderDto.setVin(xpVehicle.getVehicleVin());
- orderMissionClient.pushOrder(pushOrderDto);
- }, 3, TimeUnit.MINUTES);
- break;
- }
-
//等待乘客下车，开始倒计时发下巡游单
if(!orderId.contains("XU")){
if(orderId.contains("TEST")){
@@ -1231,7 +1211,6 @@
xpOrderClient.updateOrderStatus(Long.parseLong(orderId), OrderStatusEnum.SEE_OFF_GUESTS.getCode());
}
}
-
break;
case ORDER_DROPOFF_COMPLETED:
//下车完成，不需要处理状态，由后续的乘客主动触发或者定时任务触发
--
Gitblit v1.7.1