From 0c1b8395f6a7dd28a140c0b22d9c75af0d37d7de Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 06 三月 2026 15:24:43 +0800
Subject: [PATCH] 修改bug

---
 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 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 95f813a..e19fb31 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
@@ -208,13 +208,15 @@
         count = fivePushTime / 3;
         processPushOrder(quoteName, count, uid, split, orderNo, xpTradingStrategy, distance, duration, planRule);
 
-        // 最终没找到车
-//        redisService.popFirstElement(quoteName);
+
         // 取消订单
         R<XpOrder> xpOrderR = xpOrderClient.queryOrderById(Long.valueOf(orderId));
-        if(xpOrderR.getCode()==200){
-            if (xpOrderR.getData().getStatus()==1) {
+        if (xpOrderR.getCode() == 200) {
+            if (xpOrderR.getData().getStatus() == 1) {
                 xpOrderClient.cancelOrder(orderId);
+
+                // 最终没找到车
+                redisService.popFirstElement(quoteName);
             }
         }
 
@@ -232,6 +234,8 @@
      */
     @SneakyThrows
     private void processPushOrder(String quoteName, int count, String uid, String[] split, String orderNo, XpTradingStrategy xpTradingStrategy, String distance, String duration, String planRule) {
+        // 卡住3秒
+        Thread.sleep(3000);
         System.out.println("进入推单环环节");
         if (count == 0) {
             count = 1;
@@ -772,7 +776,7 @@
                             continue;
                         }
                         XpVehicle vehiclePosition = vehiclePositionR.getData();
-                        if (vehiclePosition.getStatus() != 1 || vehiclePosition.getState() != 0 || vehiclePosition.getVehicleType()==1) {
+                        if (vehiclePosition.getStatus() != 1 || vehiclePosition.getState() != 0 || vehiclePosition.getVehicleType() == 1) {
                             lock.unlock();
                             continue;
                         }
@@ -814,7 +818,7 @@
                             continue;
                         }
                         XpVehicle vehicleId1 = vehicleR.getData();
-                        if (vehicleId1.getStatus() != 1 || vehicleId1.getState() != 0 || vehicleId1.getVehicleType()==1) {
+                        if (vehicleId1.getStatus() != 1 || vehicleId1.getState() != 0 || vehicleId1.getVehicleType() == 1) {
                             lock.unlock();
                             continue;
                         }

--
Gitblit v1.7.1