From 46342ddcf5d52ccbf2ae8d8a9a0b14cc0d29b250 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 16 四月 2026 22:14:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0

---
 xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpTestOrderClient.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpTestOrderClient.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpTestOrderClient.java
index 58d36a4..134274e 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpTestOrderClient.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpTestOrderClient.java
@@ -2,10 +2,12 @@
 
 import com.xiaopeng.api.factory.order.XpTestOrderClientFallbackFactory;
 import com.xiaopeng.api.model.order.XpTestOrder;
+import com.xiaopeng.api.vo.order.OrderTrajectoryVo;
 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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 
@@ -20,7 +22,7 @@
      * @param orderId 订单id
      * @return 订单详情
      */
-    @PostMapping("/inner/v1/testOrder/queryOrderById")
+    @PostMapping("/logan/inner/v1/testOrder/queryOrderById")
     R<XpTestOrder> queryOrderById(@RequestParam Long orderId);
 
 
@@ -30,7 +32,7 @@
      * @param status
      * @return
      */
-    @PostMapping("/inner/v1/testOrder/updateOrderStatus")
+    @PostMapping("/logan/inner/v1/testOrder/updateOrderStatus")
     R<String> updateOrderStatus(@RequestParam Long orderId,
                                 @RequestParam Integer status);
 
@@ -43,4 +45,22 @@
      */
     @PostMapping("/inner/testOrder/cancelTestOrderById")
     R<?> cancelTestOrderById(@RequestParam Long orderId);
+
+
+    /**
+     * 根据测试计划ID查询订单数量
+     * @param testPlanId
+     * @return
+     */
+    @PostMapping("/inner/v1/testOrder/queryCountByTestPlanId")
+    R<Long> queryCountByTestPlanId(@RequestParam Long testPlanId);
+
+
+    /**
+     * 保存订单轨迹数据
+     * @param orderTrajectory
+     * @return
+     */
+    @PostMapping("/logan/inner/v1/testOrder/saveVehicleLocation")
+    R<String> saveVehicleLocation(@RequestBody OrderTrajectoryVo orderTrajectory);
 }

--
Gitblit v1.7.1