From 3343bf1c7b1b9369ff4e56b7929c0eeac4b9ab63 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期日, 18 九月 2022 14:50:19 +0800
Subject: [PATCH] 修改规则和出场日志
---
src/main/java/com/boying/service/CostRuleService.java | 12 +++++++++---
src/main/java/com/boying/controller/OutParkController.java | 8 ++++++++
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/boying/controller/OutParkController.java b/src/main/java/com/boying/controller/OutParkController.java
index 0e6782c..73e75fb 100644
--- a/src/main/java/com/boying/controller/OutParkController.java
+++ b/src/main/java/com/boying/controller/OutParkController.java
@@ -215,6 +215,8 @@
@PostMapping("outPark2")
public Object outPark(String carNo,Long barrierId,Long parkId,String code2) {
+ String s = "寮�濮嬫墽琛屽嚭鍦烘帴鍙�------>";
+ System.out.println(s);
Barrier barrier1 = findBarrier(code2);
barrierId = barrier1.getId();
parkId = barrier1.getParkId();
@@ -227,15 +229,21 @@
EnterPark enterPark = enterParkService.findByCarNo(carNo);
if(enterPark==null){
+ String s1 = "鏈彂鐜板叆鍦鸿溅杈嗭細"+carNo;
+ System.out.println(s1);
return error("鏃犺繘鍦鸿褰曟垨鎵嬫満鍙疯繘鍑鸿緭鍏ヤ笉涓�鑷�",null);
}else{
+ String s1 = "鍙戠幇鍏ュ満杞﹁締: "+enterPark.getCarNo()+",閬撻椄id涓猴細"+enterPark.getBarrierId()+",鍋滆溅鍦篿d锛�"+enterPark.getParkId()+",杩濈珷鏍囪瘑锛�"+enterPark.getStatus();
+ System.out.println(s1);
outPark.setEnterTime(enterPark.getCreateTime());
}
long l = outPark.getCreateTime().getTime() - enterPark.getCreateTime().getTime();
+ System.out.println("鍦哄唴鏃堕暱涓猴細"+l+"姣,鍚堣涓�: "+l/(1000*60)+"绉�");
outPark.setTime(l/(1000*60));
double money = 0;
try {
money = costRuleService.getMoney(parkId, enterPark.getCreateTime(), outPark.getCreateTime(), 1);
+ System.out.println("閲戦涓猴細"+money);
} catch (ParseException e) {
e.printStackTrace();
}
diff --git a/src/main/java/com/boying/service/CostRuleService.java b/src/main/java/com/boying/service/CostRuleService.java
index 21bb28a..352d51e 100644
--- a/src/main/java/com/boying/service/CostRuleService.java
+++ b/src/main/java/com/boying/service/CostRuleService.java
@@ -274,10 +274,16 @@
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){//澶т簬灏侀《浠锋牸
--
Gitblit v1.9.1