From 6da3cde42c90fa5383cf1b48e632cb1107c80d3e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 25 四月 2026 07:27:16 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/CustomerServiceController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/CustomerServiceController.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/CustomerServiceController.java
index b5bff1b..f21e84a 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/CustomerServiceController.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/CustomerServiceController.java
@@ -154,7 +154,7 @@
@GetMapping("/getOrderHistoryTrajectory/{orderId}")
@ApiOperation(value = "根据订单号查询实际行驶路径", notes = "客服系统对接")
@ApiImplicitParam(name = "orderId", value = "订单ID", required = true, dataType = "Long", paramType = "path")
- public R<List<TrajectoryVo>> getOrderHistoryTrajectory(@PathVariable Long orderId){
+ public R<OrderHistoryTrajectoryVo> getOrderHistoryTrajectory(@PathVariable Long orderId){
List<OrderTrajectory> orderTrajectoryList = mongoTemplate.find(Query.query(Criteria.where("orderId").is(orderId)), OrderTrajectory.class);
List<TrajectoryVo> collect = orderTrajectoryList.stream().map(trajectory -> {
String[] split = trajectory.getLocation().split(",");
@@ -163,7 +163,9 @@
jsonObject.setLat(Double.parseDouble(split[1]));
return jsonObject;
}).collect(Collectors.toList());
- return R.ok(collect);
+ OrderHistoryTrajectoryVo vo = new OrderHistoryTrajectoryVo();
+ vo.setActualPath(collect);
+ return R.ok(vo);
}
--
Gitblit v1.7.1