From acb114190c6e6843a071c6ce50b1e28027adc862 Mon Sep 17 00:00:00 2001
From: yyy <1083599556@qq.com>
Date: 星期四, 07 五月 2026 10:38:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/CustomerServiceController.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 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 f21e84a..280d33f 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
@@ -217,20 +217,23 @@
/**
* 10. 根据 VIN 查询剩余电量及预估续航
- * @param vin
* @return
*/
- @GetMapping("/getVehicleRange/{vin}")
- @ApiOperation(value = "根据 VIN 查询剩余电量及预估续航", notes = "客服系统对接")
- @ApiImplicitParam(name = "vin", value = "vin码", required = true, dataType = "string", paramType = "path")
- public R<VehicleRangeVo> getVehicleRange(@PathVariable String vin){
- VehiclePosition vehiclePositions = mongoTemplate.findOne(Query.query(Criteria.where("vin").is(vin)), VehiclePosition.class);
- if(null == vehiclePositions){
- return R.ok();
- }
+ @GetMapping("/getVehicleRange/{orderId}")
+ @ApiOperation(value = "根据 订单id 查询剩余电量及预估续航", notes = "客服系统对接")
+ @ApiImplicitParam(name = "orderId", value = "订单id", required = true, dataType = "string", paramType = "path")
+ public R<VehicleRangeVo> getVehicleRange(@PathVariable String orderId){
+ XpOrder xpOrder = xpOrderService.getById(orderId);
VehicleRangeVo vo = new VehicleRangeVo();
- vo.setBatteryLevel(vehiclePositions.getCurrentElectricity());
- vo.setEstimatedRange(Double.valueOf(vehiclePositions.getMileageRange()));
+ if(null != xpOrder.getVehicleId()){
+ XpVehicle xpVehicle = xpVehicleClient.queryById(xpOrder.getVehicleId()).getData();
+ VehiclePosition vehiclePositions = mongoTemplate.findOne(Query.query(Criteria.where("vin").is(xpVehicle.getVehicleVin())), VehiclePosition.class);
+ if(null == vehiclePositions){
+ return R.ok();
+ }
+ vo.setBatteryLevel(vehiclePositions.getCurrentElectricity());
+ vo.setEstimatedRange(Double.valueOf(vehiclePositions.getMileageRange()));
+ }
return R.ok(vo);
}
@@ -297,6 +300,7 @@
@ApiOperation(value = "根据订单号查询订单日志", notes = "客服系统对接")
@ApiImplicitParam(name = "orderId", value = "订单ID", required = true, dataType = "Long", paramType = "path")
public R<UserOrderInfoVo> getOrderInfo(@PathVariable Long orderId){
- return R.ok(new UserOrderInfoVo());
+ UserOrderInfoVo orderHistoryInfo = xpOrderService.getOrderHistoryInfo(orderId);
+ return R.ok(orderHistoryInfo);
}
}
--
Gitblit v1.7.1