From 1a21d93cbf6af597b328df1f7815cc7e7c8ef573 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 24 八月 2023 17:45:19 +0800
Subject: [PATCH] 优化代码

---
 java110-core/src/main/java/com/java110/core/factory/TempCarFeeFactory.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java110-core/src/main/java/com/java110/core/factory/TempCarFeeFactory.java b/java110-core/src/main/java/com/java110/core/factory/TempCarFeeFactory.java
index 1f6eb80..7b2c286 100644
--- a/java110-core/src/main/java/com/java110/core/factory/TempCarFeeFactory.java
+++ b/java110-core/src/main/java/com/java110/core/factory/TempCarFeeFactory.java
@@ -2,7 +2,7 @@
 
 
 import com.java110.dto.machine.CarInoutDto;
-import com.java110.dto.tempCarFeeConfig.TempCarFeeConfigAttrDto;
+import com.java110.dto.fee.TempCarFeeConfigAttrDto;
 import com.java110.utils.util.DateUtil;
 
 import java.text.ParseException;
@@ -55,7 +55,7 @@
         double min = 0.0;
         try {
             //涓嶆槸鏀粯瀹屾垚 鐘舵��
-            if (CarInoutDto.STATE_PAY.equals(carInoutDto.getState())) {
+            if (CarInoutDto.STATE_PAY.equals(carInoutDto.getState()) || CarInoutDto.STATE_REPAY.equals(carInoutDto.getState())) {
 
                 try {
                     payTime = DateUtil.getDateFromString(carInoutDto.getPayTime(), DateUtil.DATE_FORMATE_STRING_A);
@@ -67,7 +67,7 @@
             }
             Date nowTime = DateUtil.getCurrentDate();
             //鏀粯瀹屾垚瓒呰繃15鍒嗛挓
-            min = (nowTime.getTime() - payTime.getTime()) / (60 * 1000);
+            min = (nowTime.getTime() - payTime.getTime()) / (60 * 1000* 1.00);
 
             return new Double(Math.ceil(min)).longValue();
             //return (nowTime.getTime() - payTime.getTime()) / (60 * 1000);

--
Gitblit v1.8.0