From 67db945bbfd7ae08335652c30537a68e443deb78 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期日, 15 三月 2026 16:22:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/utils/TaxiPricingDemoService.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/utils/TaxiPricingDemoService.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/utils/TaxiPricingDemoService.java
index 05e6a7f..d9881ff 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/utils/TaxiPricingDemoService.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/utils/TaxiPricingDemoService.java
@@ -20,9 +20,9 @@
Date orderTime = new Date();
//
// 模拟总里程 25.0 km，以触发多级远途加价
- double totalMillige = 2.984;
+ double totalMillige = 1.24;
Calendar cal = Calendar.getInstance();
- cal.set(2026, Calendar.APRIL, 11, 15, 57, 50);
+ cal.set(2026, Calendar.APRIL, 11, 15, 48, 50);
orderTime = cal.getTime();
// 模拟 GPS 轨迹点
List<GpsPoint> points = createMockGpsPoints(orderTime);
@@ -37,9 +37,9 @@
System.err.println("--------------------------");
System.err.println("应付总额: " + totalAmount + " 元");
-// List<GpsPoint> mockGpsPoints = createMockGpsPoints(orderTime);
-// double sum = mockGpsPoints.stream().mapToDouble(GpsPoint::getDistance).sum();
-// System.err.println(sum);
+ List<GpsPoint> mockGpsPoints = createMockGpsPoints(orderTime);
+ double sum = mockGpsPoints.stream().mapToDouble(GpsPoint::getDistance).sum();
+ System.err.println(sum);
}
@@ -293,17 +293,17 @@
list.add(new GpsPoint(188, startTs + 2 * 50 * 1000));
list.add(new GpsPoint(150, startTs + 2 * 60 * 1000));
list.add(new GpsPoint(126, startTs + 2 * 70 * 1000));
- list.add(new GpsPoint(138, startTs + 2 * 80 * 1000));
- list.add(new GpsPoint(119, startTs + 2 * 90 * 1000));
- list.add(new GpsPoint(147, startTs + 2 * 100 * 1000));
- list.add(new GpsPoint(155, startTs + 2 * 110 * 1000));
- list.add(new GpsPoint(182, startTs + 2 * 120 * 1000));
- list.add(new GpsPoint(172, startTs + 2 * 130 * 1000));
- list.add(new GpsPoint(202, startTs + 2 * 140 * 1000));
- list.add(new GpsPoint(162, startTs + 2 * 150 * 1000));
- list.add(new GpsPoint(182, startTs + 2 * 160 * 1000));
- list.add(new GpsPoint(132, startTs + 2 * 170 * 1000));
- list.add(new GpsPoint(122, startTs + 2 * 180 * 1000));
+// list.add(new GpsPoint(138, startTs + 2 * 80 * 1000));
+// list.add(new GpsPoint(119, startTs + 2 * 90 * 1000));
+// list.add(new GpsPoint(147, startTs + 2 * 100 * 1000));
+// list.add(new GpsPoint(155, startTs + 2 * 110 * 1000));
+// list.add(new GpsPoint(182, startTs + 2 * 120 * 1000));
+// list.add(new GpsPoint(172, startTs + 2 * 130 * 1000));
+// list.add(new GpsPoint(202, startTs + 2 * 140 * 1000));
+// list.add(new GpsPoint(162, startTs + 2 * 150 * 1000));
+// list.add(new GpsPoint(182, startTs + 2 * 160 * 1000));
+// list.add(new GpsPoint(132, startTs + 2 * 170 * 1000));
+// list.add(new GpsPoint(122, startTs + 2 * 180 * 1000));
// list.add(new GpsPoint(262, startTs + 2 * 190 * 1000));
// list.add(new GpsPoint(242, startTs + 2 * 200 * 1000));
// list.add(new GpsPoint(282, startTs + 2 * 210 * 1000));
--
Gitblit v1.7.1