From 18087f533cd48ddb9f972c0848ffe920ec58ee8e Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 26 九月 2022 16:01:14 +0800
Subject: [PATCH] 修改打包和app
---
src/main/java/com/boying/service/CostRuleService.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/boying/service/CostRuleService.java b/src/main/java/com/boying/service/CostRuleService.java
index 21bb28a..4a3816c 100644
--- a/src/main/java/com/boying/service/CostRuleService.java
+++ b/src/main/java/com/boying/service/CostRuleService.java
@@ -274,17 +274,23 @@
public double money(long l,Double cost,Integer maxCost){
l=l/1000/60;
int time = 0;
- if(((l*1.0)/60)>(l/60)){//鍒ゆ柇鍋滆溅鏃堕棿鏄惁瑕佸姞1
- time = Long.valueOf(l / 60 + 1).intValue();
+// if(((l*1.0)/60)>(l/60)){//鍒ゆ柇鍋滆溅鏃堕棿鏄惁瑕佸姞1
+// time = Long.valueOf(l / 60 + 1).intValue();
+// }else{
+// time = Long.valueOf(l / 60).intValue();
+// }
+
+ if(((l*1.0)/30)>(l/30)){//鍒ゆ柇鍋滆溅鏃堕棿鏄惁瑕佸姞1
+ time = Long.valueOf(l / 30 + 1).intValue();
}else{
- time = Long.valueOf(l / 60).intValue();
+ time = Long.valueOf(l / 30).intValue();
}
if(maxCost!=null){
- if(time*cost>maxCost){//澶т簬灏侀《浠锋牸
+ if(time*cost+1>maxCost){//澶т簬灏侀《浠锋牸
return maxCost;
}
}
- return time*cost;
+ return time*cost+1;
}
public static void main(String[] args) {
--
Gitblit v1.9.1