From a8f79a74b1d6ba53d159b77f2226e40454186b91 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 05 三月 2026 19:18:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
index c9fb160..95f813a 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
@@ -211,7 +211,12 @@
         // 最终没找到车
 //        redisService.popFirstElement(quoteName);
         // 取消订单
-        xpOrderClient.cancelOrder(orderId);
+        R<XpOrder> xpOrderR = xpOrderClient.queryOrderById(Long.valueOf(orderId));
+        if(xpOrderR.getCode()==200){
+            if (xpOrderR.getData().getStatus()==1) {
+                xpOrderClient.cancelOrder(orderId);
+            }
+        }
 
     }
 

--
Gitblit v1.7.1