From c61295c7a6ca17857ff629ddb48c2ef65bb691b1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 14 三月 2026 11:52:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/utils/TaxiPricingDemoService.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 236f9a0..05e6a7f 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
@@ -22,7 +22,7 @@
// 模拟总里程 25.0 km，以触发多级远途加价
double totalMillige = 2.984;
Calendar cal = Calendar.getInstance();
- cal.set(2026, Calendar.APRIL, 11, 15, 58, 15);
+ cal.set(2026, Calendar.APRIL, 11, 15, 57, 50);
orderTime = cal.getTime();
// 模拟 GPS 轨迹点
List<GpsPoint> points = createMockGpsPoints(orderTime);
@@ -262,13 +262,13 @@
public long getLocatetime() { return locatetime; }
}
- private static PricingConfig setupMockConfig() {
+ private static PricingConfig setupMockConfig() {
PricingConfig config = new PricingConfig();
- config.peaks.add(new PricingRule("高峰期", "04:00", "05:00", 15, 1, 10, 4, 4));
- config.peaks.add(new PricingRule("高峰期", "15:00", "16:00", 15, 1, 10, 4, 4));
- config.night = new PricingRule("夜间行驶", "20:04", "23:00", 15, 1, 10, 3, 3);
- config.holiday = new PricingRule("节假日", "00:00", "23:59", 20, 1, 10, 4, 4);
- config.normals.add(new PricingRule("普通时段", "00:00", "23:59", 10.0, 1, 10.0, 3, 3));
+ config.peaks.add(new PricingRule("高峰期", "04:00", "05:00", 15, 1, 1, 4, 4));
+ config.peaks.add(new PricingRule("高峰期", "15:00", "16:00", 15, 1, 1, 4, 4));
+ config.night = new PricingRule("夜间行驶", "20:04", "23:00", 15, 1, 1, 3, 3);
+ config.holiday = new PricingRule("节假日", "00:00", "23:59", 20, 1, 1, 4, 4);
+ config.normals.add(new PricingRule("普通时段", "00:00", "23:59", 10.0, 1, 1, 3, 3));
// --- 远途加价区间配置 (关键修改) ---
// 1. 超过 num1(12) 不足 num2(20), 加收 num3(1.2)
--
Gitblit v1.7.1