From 4f7fd9e879d9de211b255eb21535a034893ffbff Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 14 五月 2026 16:20:48 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpOrderClient.java | 16 +++++++++++++++-
1 files changed, 15 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 1726dd9..2595785 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
@@ -98,7 +98,7 @@
* @param
* @return 订单数量
*/
- @PostMapping("/inner/order/todayCancellationCount")
+ @PostMapping("/logan/inner/order/todayCancellationCount")
R<Integer> todayCancellationCount(@RequestParam Long userId);
/**
@@ -153,6 +153,13 @@
R<String> saveVehicleLocation(@RequestBody OrderTrajectoryVo orderTrajectory);
+ /**
+ * 生成巡游单，并且推送车端订单数据
+ * @param vo
+ * @return
+ */
+ @PostMapping("/logan/inner/order/addNewCruiseMission")
+ R<?> addNewCruiseMission(@RequestParam("orderId") String orderId);
/**
* 判断用户类型
@@ -179,4 +186,11 @@
*/
@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