From cf3c19b39817c464657a6505af842d99852f0689 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 21 三月 2026 19:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
index 72810dc..6a65cdc 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -2887,16 +2887,16 @@
XpPoint endPoint = xpPointR1.getData();
xpOrderDetailVO.setEndParkingTimeLimit(endPoint.getParkingTimeLimit());
}
- // 算时间
- if (xpOrder.getStatus() == 1) {
- R<Integer> r = xpPricingClient.getWaitTime(new LonLatDto(xpOrder.getStartLon(), xpOrder.getStartLat()));
- if (r.getCode() == R.SUCCESS) {
- xpOrderDetailVO.setEstimatedTime(r.getData());
- } else {
- throw new RuntimeException(r.getMsg());
- }
-
- }
+// // 算时间
+// if (xpOrder.getStatus() == 1) {
+// R<Integer> r = xpPricingClient.getWaitTime(new LonLatDto(xpOrder.getStartLon(), xpOrder.getStartLat()));
+// if (r.getCode() == R.SUCCESS) {
+// xpOrderDetailVO.setEstimatedTime(r.getData());
+// } else {
+// throw new RuntimeException(r.getMsg());
+// }
+//
+// }
if (xpOrder.getVehicleId() != null) {
R<XpVehicle> xpVehicleR = xpVehicleClient.queryById(xpOrder.getVehicleId());
--
Gitblit v1.7.1