From 4dbdb4bc373f0cb20c7aa374d8cbcadfa7c56c97 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 01 四月 2026 14:59:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpOrderClient.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 1 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 fc6b510..62ab0e1 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,10 +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;
@@ -34,7 +36,7 @@
* 查询是否有未支付订单 或 正在进行的订单
*/
@PostMapping("/inner/order/has-unpaid-order")
- R<Long> hasUnPaodOrder(String uid);
+ R<Long> hasUnPaodOrder(@RequestParam String uid);
/**
@@ -84,4 +86,60 @@
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("/inner/order/countActiveOrders")
+ R<Integer> countActiveOrdersByCityId(@RequestParam("cityId") Long cityId);
+
+
+ /**
+ * 成功操作下发命令后调用 用于弹出redis队列的获取成功的数据
+ */
+ @PostMapping("/inner/order/popOrder")
+ R<?> popOrder(@RequestBody PopOrderDto dto);
+
+ /**
+ * 修改订单信息
+ *
+ * @param xpOrder 订单信息
+ */
+ @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