From 28ac22a4dd20a5abfa5fae11ce081d8120f1f476 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 21 四月 2026 22:18:28 +0800
Subject: [PATCH] 新增加客服系统对接接口

---
 xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 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 f7979bc..22c7104 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
@@ -450,9 +450,12 @@
                     if(!order_id.contains("TEST")){
                         xpPushMessageClient.pushOrderRoute(dto);//存储历史轨迹
                         // 给连环派单的用户推送
-                        Long nextOrderId = redisService.getCacheObject(CacheConstants.nextOrder(order_id));
-                        if (null != nextOrderId){
-                            dto.setOrderId(nextOrderId);
+                        String json = redisService.getCacheObject(CacheConstants.nextOrder(order_id));
+                        if (StringUtils.isNotEmpty(json)){
+                            JSONObject jsonObject = JSON.parseObject(json);
+                            dto.setOrderId(jsonObject.getLong("orderId"));
+                            dto.setEndLongitude(jsonObject.getDouble("endLongitude"));
+                            dto.setEndLatitude(jsonObject.getDouble("endLatitude"));
                             xpPushMessageClient.pushOrderRoute(dto);
                         }
                         xpOrderClient.saveVehicleLocation(orderTrajectory);
@@ -1343,8 +1346,10 @@
                                 xpOrderClient.updateOrderStatus(Long.parseLong(orderId), OrderStatusEnum.SEE_OFF_GUESTS.getCode(), true);
                                 redisService.setCacheObject("ORDER_STATUS:" + orderId, OrderStatusEnum.SEE_OFF_GUESTS.getCode(), 24L, TimeUnit.HOURS);
                                 // 判断当前订单的车辆是否有连环派单,然后判断是都还满足连环派单的条件,不满足则需要重新派单
-                                Long nextOrderId = redisService.getCacheObject(CacheConstants.nextOrder(orderId));
-                                if(null != nextOrderId){
+                                String json = redisService.getCacheObject(CacheConstants.nextOrder(orderId));
+                                if (StringUtils.isNotEmpty(json)){
+                                    JSONObject jsonObject = JSON.parseObject(json);
+                                    Long nextOrderId = jsonObject.getLong("orderId");
                                     XpOrder nextOrder = xpOrderClient.queryOrderById(nextOrderId).getData();
                                     if(null != nextOrder && nextOrder.getStatus() == OrderStatusEnum.PICK_UP.getCode()){
                                         redisService.setCacheObject(CacheConstants.nextOrder(orderId),null);

--
Gitblit v1.7.1