From 5cad6611646e3b2fce100b4ed97c5e4511893620 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 25 二月 2026 16:55:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java b/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java
index d77f751..71497f4 100644
--- a/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java
+++ b/xp-robotaxi-automatic-pilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java
@@ -40,15 +40,21 @@
     @PostMapping("/inner/pushOrder")
     public R<Boolean> pushOrder(@RequestBody PushOrderDto dto) {
         RTTask task = new RTTask();
-        task.setOrder_id(dto.getOrderId().toString());
+        task.setOrder_id(dto.getOrderId());
         task.setTask_id("MISSION_"+ IdUtil.fastUUID());
-        task.setTask_type(TaskType.ROBOTAXI);
+        if(dto.getOrderId().contains("XU")){
+            task.setTask_type(TaskType.CRUISE);
+        }else {
+            task.setTask_type(TaskType.ROBOTAXI);
+        }
         task.setStatus(TaskStatus.PENDING);
         SnowFlake snowFlake = new SnowFlake(0, 0);
         snowFlake.withStartTimestamp(1420041600000L);
         long sequence = snowFlake.nextId();
         MqttPublishDto mqttPublishDto = xpuUtil.cloudCreateOrder(task, dto.getVin(),sequence);
-        if (mqttPublishDto.getCode()== 200) {
+
+        // 正常单子才修改  巡游单子不修改状态
+        if (!dto.getOrderId().contains("XU") && mqttPublishDto.getCode()== 200) {
             // 修改车子为接单状态
             xpVehicleClient.updateVehicleStatus(new UpdateVehicleStateDto(dto.getVin(),1));
 

--
Gitblit v1.7.1