From 7f3081da3c0597cfbfc8f0fc4e342c4ceb901f6d Mon Sep 17 00:00:00 2001
From: kong <sunuping1@sina.com>
Date: 星期日, 12 四月 2026 18:04:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpOrderClient.java | 86 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 78 insertions(+), 8 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 95ea609..7974790 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
@@ -1,9 +1,12 @@
package com.xiaopeng.api.feignClient.order;
+import com.xiaopeng.api.dto.order.GetOrderNumDto;
+import com.xiaopeng.api.dto.order.PopOrderDto;
import com.xiaopeng.api.dto.statistics.OrderStatisticsDTO;
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;
@@ -25,15 +28,15 @@
* @param query 查询参数
* @return 订单统计数据
*/
- @PostMapping("/inner/order/statistics")
+ @PostMapping("/logan/inner/order/statistics")
R<OrderStatisticsDTO> getOrderStatistics(@RequestBody StatisticsQueryDTO query);
/**
* 查询是否有未支付订单 或 正在进行的订单
*/
- @PostMapping("/inner/order/has-unpaid-order")
- R<Long> hasUnPaodOrder(String uid);
+ @PostMapping("/logan/inner/order/has-unpaid-order")
+ R<Long> hasUnPaodOrder(@RequestParam String uid);
/**
@@ -42,7 +45,7 @@
* @param orderId 订单id
* @return 订单详情
*/
- @PostMapping("/inner/order/queryOrderById")
+ @PostMapping("/logan/inner/order/queryOrderById")
R<XpOrder> queryOrderById(@RequestParam Long orderId);
/**
@@ -50,7 +53,7 @@
*
* @param xpOrder 订单信息
*/
- @PostMapping("/inner/order/addOrder")
+ @PostMapping("/logan/inner/order/addOrder")
R<Long> addOrder(@RequestBody XpOrder xpOrder);
@@ -59,8 +62,8 @@
*
* @param orderId 订单id
*/
- @PostMapping("/inner/order/cancelOrder")
- R<?> cancelOrder(String orderId);
+ @PostMapping("/logan/inner/order/cancelOrder")
+ R<?> cancelOrder(@RequestParam("orderId") String orderId);
/**
@@ -69,7 +72,74 @@
* @param orderNo 订单编号
* @return 订单详情
*/
- @PostMapping("/inner/order/queryOrderByOrderNo")
+ @PostMapping("/logan/inner/order/queryOrderByOrderNo")
R<XpOrder> queryOrderByOrderNo(@RequestParam String orderNo);
+
+ /**
+ * 获取订单数量
+ *
+ * @param
+ * @return 订单数量
+ */
+ @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("/logan/inner/order/popOrder")
+ R<?> popOrder(@RequestBody PopOrderDto dto);
+
+ /**
+ * 修改订单信息
+ *
+ * @param xpOrder 订单信息
+ */
+ @PostMapping("/logan/inner/order/updateOrder")
+ R<?> updateOrder(@RequestBody XpOrder xpOrder);
+
+
+ /**
+ * 修改订单状态
+ * @param orderId
+ * @param status
+ * @return
+ */
+ @PostMapping("/logan/inner/v1/order/updateOrderStatus")
+ R<String> updateOrderStatus(@RequestParam Long orderId,
+ @RequestParam Integer status);
+
+
+ /**
+ * 保存订单轨迹数据
+ * @param orderTrajectory
+ * @return
+ */
+ @PostMapping("/logan/inner/v1/order/saveVehicleLocation")
+ R<String> saveVehicleLocation(@RequestBody OrderTrajectoryVo orderTrajectory);
+
+
+
}
--
Gitblit v1.7.1