From d597b03477f904bc87bc9c3a984f9bfa485a906d Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 25 三月 2026 18:53:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi

---
 xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpOrderClient.java |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpOrderClient.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpOrderClient.java
index a940be1..338e167 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpOrderClient.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpOrderClient.java
@@ -6,6 +6,7 @@
 import com.xiaopeng.api.dto.statistics.StatisticsQueryDTO;
 import com.xiaopeng.api.factory.order.XpOrderClientFallbackFactory;
 import com.xiaopeng.api.model.order.XpOrder;
+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;
@@ -84,6 +85,15 @@
     @PostMapping("/inner/order/getOrderNum")
     R<Integer> getOrderNum(@RequestBody GetOrderNumDto dto);
 
+    /**
+     * 查询指定城市进行中的订单数量(status=1)
+     *
+     * @param cityId 开通城市ID
+     * @return 进行中订单数量
+     */
+    @GetMapping("/inner/order/countActiveOrders")
+    R<Integer> countActiveOrdersByCityId(@RequestParam("cityId") Long cityId);
+
 
     /**
      * 成功操作下发命令后调用 用于弹出redis队列的获取成功的数据
@@ -99,4 +109,26 @@
     @PostMapping("/inner/order/updateOrder")
     R<?> updateOrder(@RequestBody XpOrder xpOrder);
 
+
+    /**
+     * 修改订单状态
+     * @param orderId
+     * @param status
+     * @return
+     */
+    @PostMapping("/inner/v1/order/updateOrderStatus")
+    R<String> updateOrderStatus(@RequestParam Long orderId,
+                                       @RequestParam Integer status);
+
+
+    /**
+     * 保存订单轨迹数据
+     * @param orderTrajectory
+     * @return
+     */
+    @PostMapping("/inner/v1/order/saveVehicleLocation")
+    R<String> saveVehicleLocation(@RequestBody OrderTrajectoryVo orderTrajectory);
+
+
+
 }

--
Gitblit v1.7.1