From b3d1411517baca17d92dcfe3a0933cdc342b3145 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 16 五月 2026 11:52:41 +0800
Subject: [PATCH] Merge branch '1.1' 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 | 145 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 136 insertions(+), 9 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..c621db0 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,13 +1,21 @@
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;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
/**
* 订单Feign客户端
@@ -25,15 +33,21 @@
* @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);
+
+ /**
+ * 查询是否有未支付订单
+ */
+ @PostMapping("/logan/inner/order/has-unpay-order")
+ R<Long> hasUnPayOrder(@RequestParam String uid);
/**
@@ -42,7 +56,7 @@
* @param orderId 订单id
* @return 订单详情
*/
- @PostMapping("/inner/order/queryOrderById")
+ @PostMapping("/logan/inner/order/queryOrderById")
R<XpOrder> queryOrderById(@RequestParam Long orderId);
/**
@@ -50,7 +64,7 @@
*
* @param xpOrder 订单信息
*/
- @PostMapping("/inner/order/addOrder")
+ @PostMapping("/logan/inner/order/addOrder")
R<Long> addOrder(@RequestBody XpOrder xpOrder);
@@ -59,8 +73,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 +83,120 @@
* @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("/logan/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);
+ /**
+ * 行驶中车辆异常，订单状态修改- 修改状态=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);
+
+
+ /**
+ * 生成巡游单，并且推送车端订单数据
+ * @param vo
+ * @return
+ */
+ @PostMapping("/logan/inner/order/addNewCruiseMission")
+ R<?> addNewCruiseMission(@RequestParam("orderId") String orderId);
+
+ /**
+ * 判断用户类型
+ * @param userId
+ * @return 1=老用户，2=新用户，3=流失用户
+ */
+ @PostMapping("/logan/inner/order/determineUserType")
+ R<Integer> determineUserType(@RequestParam Long userId);
+
+
+ /**
+ * 获取用户订单数量
+ * @param userId
+ * @return
+ */
+ @PostMapping("/logan/inner/order/getUserOrderNum")
+ R<Long> getUserOrderNum(@RequestParam Long userId);
+
+
+ /**
+ * 判断用户类型
+ * @param userType
+ * @return 2=老用户，3=新用户，4=流失用户
+ */
+ @PostMapping("/logan/inner/order/getUserTypeIdList")
+ R<List<Long>> getUserTypeIdList(@RequestParam Integer userType);
+ /**
+ * 将订单推单状态还原重新推单
+ * @param orderId
+ * @return
+ */
+ @PostMapping("/logan/inner/order/againPushOrder")
+ R<?> againPushOrder(@RequestParam("orderId") String orderId);
}
--
Gitblit v1.7.1