From 1d8fa38794d80659dd263085198fd0e0f9a2cec7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 13 二月 2026 21:23:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/automaticPilot/OrderMissionClient.java |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/automatic/OrderMissionClient.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/automaticPilot/OrderMissionClient.java
similarity index 60%
rename from xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/automatic/OrderMissionClient.java
rename to xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/automaticPilot/OrderMissionClient.java
index e29779c..ca2a6f7 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/automatic/OrderMissionClient.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/automaticPilot/OrderMissionClient.java
@@ -1,20 +1,12 @@
-package com.xiaopeng.api.feignClient.automatic;
+package com.xiaopeng.api.feignClient.automaticPilot;
 
-import com.xiaopeng.api.dto.account.XpOperationsUserQueryDTO;
 import com.xiaopeng.api.dto.automaticPilot.PushOrderDto;
-import com.xiaopeng.api.factory.account.XpAppUserClientFallbackFactory;
-import com.xiaopeng.api.factory.automatic.OrderMissionClientFallbackFactory;
-import com.xiaopeng.api.model.account.XpOperationsUser;
-import com.xiaopeng.api.vo.account.XpOperationsUserWithRoleVO;
+import com.xiaopeng.api.factory.automaticPilot.OrderMissionClientFallbackFactory;
 import com.xiaopeng.common.core.domain.R;
 import com.xiaopeng.common.core.dto.ServiceNameConstantsEnum;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.List;
 
 /**
  * 小程序用户Feign客户端
@@ -33,4 +25,13 @@
      */
     @PostMapping("/inner/pushOrder")
      R<Boolean> pushOrder(@RequestBody PushOrderDto dto);
+
+
+    /**
+     * 取消订单
+     * @param
+     * @return
+     */
+    @PostMapping("/inner/cancelOrder")
+    R<Boolean> cancelOrder(@RequestBody PushOrderDto dto);
 }

--
Gitblit v1.7.1