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 | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 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 1eac4a0..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
@@ -104,7 +104,7 @@
* @param
* @return 订单数量
*/
- @PostMapping("/inner/order/todayCancellationCount")
+ @PostMapping("/logan/inner/order/todayCancellationCount")
R<Integer> todayCancellationCount(@RequestParam Long userId);
/**
@@ -140,8 +140,7 @@
*/
@PostMapping("/logan/inner/v1/order/updateOrderStatus")
R<String> updateOrderStatus(@RequestParam Long orderId,
- @RequestParam Integer status,
- @RequestParam Boolean orderException);
+ @RequestParam Integer status);
/**
* 行驶中车辆异常，订单状态修改- 修改状态=7 再修改 金额-再将状态修改成8
* @param orderId
@@ -160,6 +159,13 @@
R<String> saveVehicleLocation(@RequestBody OrderTrajectoryVo orderTrajectory);
+ /**
+ * 生成巡游单，并且推送车端订单数据
+ * @param vo
+ * @return
+ */
+ @PostMapping("/logan/inner/order/addNewCruiseMission")
+ R<?> addNewCruiseMission(@RequestParam("orderId") String orderId);
/**
* 判断用户类型
@@ -186,4 +192,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