From 4f7fd9e879d9de211b255eb21535a034893ffbff Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 14 五月 2026 16:20:48 +0800
Subject: [PATCH] 合并代码
---
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 e08f56e..3313e1c 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);
@@ -52,4 +54,22 @@
*/
@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);
+
+
+ /**
+ * 行程中订单异常的处理
+ * @param orderId
+ * @return
+ */
+ @PostMapping("/logan/inner/v1/testOrder/carAbnormalUpdateOrderStatus")
+ R<?> carAbnormalUpdateOrderStatus(@RequestParam Long orderId);
}
--
Gitblit v1.7.1