From 406ae5451ecde0b4b40a9ecfee07f2171fda80bc Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 四月 2026 15:04:07 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpOrderClient.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 10 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 3fb57aa..802c0f1 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;
@@ -27,14 +28,14 @@
* @param query 查询参数
* @return 订单统计数据
*/
- @PostMapping("/inner/order/statistics")
+ @PostMapping("/logan/inner/order/statistics")
R<OrderStatisticsDTO> getOrderStatistics(@RequestBody StatisticsQueryDTO query);
/**
* 查询是否有未支付订单 或 正在进行的订单
*/
- @PostMapping("/inner/order/has-unpaid-order")
+ @PostMapping("/logan/inner/order/has-unpaid-order")
R<Long> hasUnPaodOrder(@RequestParam String uid);
@@ -44,7 +45,7 @@
* @param orderId 订单id
* @return 订单详情
*/
- @PostMapping("/inner/order/queryOrderById")
+ @PostMapping("/logan/inner/order/queryOrderById")
R<XpOrder> queryOrderById(@RequestParam Long orderId);
/**
@@ -52,7 +53,7 @@
*
* @param xpOrder 订单信息
*/
- @PostMapping("/inner/order/addOrder")
+ @PostMapping("/logan/inner/order/addOrder")
R<Long> addOrder(@RequestBody XpOrder xpOrder);
@@ -61,7 +62,7 @@
*
* @param orderId 订单id
*/
- @PostMapping("/inner/order/cancelOrder")
+ @PostMapping("/logan/inner/order/cancelOrder")
R<?> cancelOrder(@RequestParam("orderId") String orderId);
@@ -71,7 +72,7 @@
* @param orderNo 订单编号
* @return 订单详情
*/
- @PostMapping("/inner/order/queryOrderByOrderNo")
+ @PostMapping("/logan/inner/order/queryOrderByOrderNo")
R<XpOrder> queryOrderByOrderNo(@RequestParam String orderNo);
@@ -81,14 +82,34 @@
* @param
* @return 订单数量
*/
- @PostMapping("/inner/order/getOrderNum")
+ @PostMapping("/logan/inner/order/getOrderNum")
R<Integer> getOrderNum(@RequestBody GetOrderNumDto dto);
+
+
+
+ /**
+ * 当日取消订单次数
+ *
+ * @param
+ * @return 订单数量
+ */
+ @PostMapping("/inner/order/todayCancellationCount")
+ R<Integer> todayCancellationCount(@RequestParam Long userId);
+
+ /**
+ * 查询指定城市进行中的订单数量（status=1）
+ *
+ * @param cityId 开通城市ID
+ * @return 进行中订单数量
+ */
+ @GetMapping("/logan/inner/order/countActiveOrders")
+ R<Integer> countActiveOrdersByCityId(@RequestParam("cityId") Long cityId);
/**
* 成功操作下发命令后调用 用于弹出redis队列的获取成功的数据
*/
- @PostMapping("/inner/order/popOrder")
+ @PostMapping("/logan/inner/order/popOrder")
R<?> popOrder(@RequestBody PopOrderDto dto);
/**
@@ -96,7 +117,7 @@
*
* @param xpOrder 订单信息
*/
- @PostMapping("/inner/order/updateOrder")
+ @PostMapping("/logan/inner/order/updateOrder")
R<?> updateOrder(@RequestBody XpOrder xpOrder);
@@ -106,8 +127,26 @@
* @param status
* @return
*/
- @PostMapping("/inner/v1/order/updateOrderStatus")
+ @PostMapping("/logan/inner/v1/order/updateOrderStatus")
R<String> updateOrderStatus(@RequestParam Long orderId,
@RequestParam Integer status);
+ /**
+ * 行驶中车辆异常，订单状态修改- 修改状态=7 再修改 金额-再将状态修改成8
+ * @param orderId
+ * @return
+ */
+ @PostMapping("/logan/inner/v1/order/carAbnormalUpdateOrderStatus")
+ R<String> carAbnormalUpdateOrderStatus(@RequestParam Long orderId);
+
+
+ /**
+ * 保存订单轨迹数据
+ * @param orderTrajectory
+ * @return
+ */
+ @PostMapping("/logan/inner/v1/order/saveVehicleLocation")
+ R<String> saveVehicleLocation(@RequestBody OrderTrajectoryVo orderTrajectory);
+
+
}
--
Gitblit v1.7.1