From 45be9d5d27748979e2081b46acbf74011f2b283b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 21 三月 2026 12:20:24 +0800
Subject: [PATCH] 修改bug和优化推送消息触发的先后顺序

---
 xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/service/KafkaConsumerService.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 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 bba13e6..ef69498 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
@@ -874,6 +874,14 @@
                 case ORDER_CANCELLED:
                     //已取消
                     if(!orderId.contains("XU")){
+                        //判断订单状态,已经取消的不作处理
+                        Object cacheObject = redisService.getCacheObject("ORDER_STATUS:" + orderId);
+                        if(null != cacheObject){
+                            int order_status = Integer.parseInt(cacheObject.toString());
+                            if(0 == order_status){
+                                return;
+                            }
+                        }
                         //行程中取消订单,按照行程结束处理
                         buildPushOrderStatus(orderId, OrderStatusEnum.SEE_OFF_GUESTS, sequence);
                         xpOrderClient.updateOrderStatus(Long.parseLong(orderId), OrderStatusEnum.SEE_OFF_GUESTS.getCode());

--
Gitblit v1.7.1