From d91a5451f78c19d19c6f3325d50bd7739c6dc168 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 25 六月 2025 19:04:18 +0800
Subject: [PATCH] bug修改
---
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index c0ff11a..588d8d9 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -411,7 +411,7 @@
if(date.getTime() > s.getTimeInMillis() && date.getTime() < e.getTimeInMillis()){
if(d > rule.getDouble("num6") && d < rule.getDouble("num7")){
- yt1 = rule.getDouble("num18") * d;
+ yt1 = rule.getDouble("num18") * (d-rule.getDouble("num6"));
}
if(d > rule.getDouble("num9") && d < rule.getDouble("num10")){
yt1 = rule.getDouble("num18") * rule.getDouble("num7");
@@ -450,7 +450,7 @@
//高峰时段处理逻辑
if((date.getTime() > s1.getTimeInMillis() && date.getTime() < e1.getTimeInMillis()) || (date.getTime() > s2.getTimeInMillis() && date.getTime() < e2.getTimeInMillis())){
if(d > rule.getDouble("num6") && d < rule.getDouble("num7")){
- yt1 = rule.getDouble("num26") * d;
+ yt1 = rule.getDouble("num26") * (d-rule.getDouble("num6"));
}
if(d > rule.getDouble("num9") && d < rule.getDouble("num10")){
yt1 = rule.getDouble("num26") * rule.getDouble("num7");
@@ -469,7 +469,7 @@
}else{
//其他时间段的计算
if(d > rule.getDouble("num6") && d < rule.getDouble("num7")){
- yt1 = rule.getDouble("num8") * d;
+ yt1 = rule.getDouble("num8") * (d-rule.getDouble("num6"));
}
if(d > rule.getDouble("num9") && d < rule.getDouble("num10")){
yt1 = rule.getDouble("num8") * rule.getDouble("num7");
--
Gitblit v1.7.1