From 1af7e3e33a47c40026584e79365900894c5c3553 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 28 三月 2026 01:38:37 +0800
Subject: [PATCH] 修改bug

---
 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
index e645156..14a3a69 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -1673,6 +1673,7 @@
                         new ImmutableMap.Builder<String, String>()
                                 .put("id", xpOrder.getId().toString())
                                 .put("appid", appid)
+                                .put("orderType", OrderType.USER_ORDER)
                                 .build();
                 QuartzManager.addJob(
                         EndTripJob.class,
@@ -1688,6 +1689,7 @@
                         new ImmutableMap.Builder<String, String>()
                                 .put("id", xpOrder.getId().toString())
                                 .put("appid", appid)
+                                .put("orderType", OrderType.USER_ORDER)
                                 .build();
                 QuartzManager.addJob(
                         AddCruiseMissionJob.class,
@@ -3025,7 +3027,25 @@
 
                 xpTestOrder.setStartTestPointId(null);
                 xpTestOrderService.updateById(xpTestOrder);
-                redisService.setCacheObject("ORDER_STATUS:" + xpTestOrder.getId(), 2, 24L, TimeUnit.HOURS);
+                redisService.setCacheObject("TEST_ORDER_STATUS:" + xpTestOrder.getId(), 2, 24L, TimeUnit.HOURS);
+            }
+        }
+        if (OrderType.TEST_CRUISE_ORDER.equals(orderType)) {
+            XpTestOrder xpTestOrder = xpTestOrderService.getById(orderId);
+            //订单为待接单状态
+            if (xpTestOrder.getStatus() < 4) {
+                xpTestOrder.setAcceptanceTime(LocalDateTime.now());
+                R<XpVehicle> byVehicleVin = xpVehicleClient.findByVehicleVin(dto.getXpVehicleVin());
+                XpVehicle vehicle = null;
+                if (byVehicleVin.getCode() == 200) {
+                    vehicle = byVehicleVin.getData();
+                    xpTestOrder.setVehicleId(vehicle.getId());
+                    xpTestOrder.setFleetId(vehicle.getFleetId());
+                }
+                xpTestOrder.setStatus(6);
+                xpTestOrder.setStartTestPointId(null);
+                xpTestOrderService.updateById(xpTestOrder);
+                redisService.setCacheObject("TEST_ORDER_STATUS:" + xpTestOrder.getId(), 6, 24L, TimeUnit.HOURS);
             }
         }
     }

--
Gitblit v1.7.1