From 43eb9202a11851c77cfd4da2e7de679aef598f5e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 13 二月 2026 21:02:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-automaticPilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/xp-robotaxi-automaticPilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java b/xp-robotaxi-automaticPilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java
index 42d3ba1..af8f0bc 100644
--- a/xp-robotaxi-automaticPilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java
+++ b/xp-robotaxi-automaticPilot-boot/src/main/java/com/xiaopeng/automaticPilot/controller/OrderMissionController.java
@@ -8,6 +8,8 @@
 import com.xiaopeng.api.vo.automaticPilot.proto.down.cloudCreateOrder.RTTask;
 import com.xiaopeng.api.vo.automaticPilot.proto.down.cloudCreateOrder.TaskStatus;
 import com.xiaopeng.api.vo.automaticPilot.proto.down.cloudCreateOrder.TaskType;
+import com.xiaopeng.api.vo.automaticPilot.proto.down.cloudOrderOperation.OrderOperation;
+import com.xiaopeng.api.vo.automaticPilot.proto.down.cloudOrderOperation.OrderOperationType;
 import com.xiaopeng.automaticPilot.util.XPUUtil;
 import com.xiaopeng.common.core.domain.R;
 import com.xiaopeng.common.core.utils.SnowFlake;
@@ -52,4 +54,19 @@
         }
         return R.ok(false);
     }
+
+
+    @PostMapping("/inner/cancelOrder")
+    R<Boolean> cancelOrder(@RequestBody PushOrderDto dto){
+        OrderOperation operation = new OrderOperation();
+        operation.setOrder_id(dto.getOrderId().toString());
+        operation.setTask_id("CANCEL_MISSION_"+ IdUtil.fastUUID());
+        operation.setOperation_type(dto.getOperation_type());
+        SnowFlake snowFlake = new SnowFlake(0, 0);
+        snowFlake.withStartTimestamp(1420041600000L);
+        long sequence = snowFlake.nextId();
+        xpuUtil.cloudOrderOperation(operation,dto.getVin(),sequence);
+        redisService.setCacheObject(String.valueOf(sequence),"cancelOrder_"+dto.getOrderId()+"_"+ dto.getVin(),30l, TimeUnit.MINUTES);
+        return R.ok(true);
+    }
 }

--
Gitblit v1.7.1