From 4e7907983a99e695f2acba4dec8bd73b7dbe6b2b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 29 六月 2023 14:41:33 +0800
Subject: [PATCH] optimize
---
java110-core/src/main/java/com/java110/core/factory/TempCarFeeFactory.java | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 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 1f85aba..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;
@@ -48,6 +48,41 @@
* @param carInoutDto
* @return
*/
+ public static long getTempCarCeilMin(CarInoutDto carInoutDto) {
+
+ //鏀粯鏃堕棿鏄惁瓒呰繃15鍒嗛挓
+ Date payTime = null;
+ double min = 0.0;
+ try {
+ //涓嶆槸鏀粯瀹屾垚 鐘舵��
+ if (CarInoutDto.STATE_PAY.equals(carInoutDto.getState()) || CarInoutDto.STATE_REPAY.equals(carInoutDto.getState())) {
+
+ try {
+ payTime = DateUtil.getDateFromString(carInoutDto.getPayTime(), DateUtil.DATE_FORMATE_STRING_A);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ } else {
+ payTime = DateUtil.getDateFromString(carInoutDto.getInTime(), DateUtil.DATE_FORMATE_STRING_A);
+ }
+ Date nowTime = DateUtil.getCurrentDate();
+ //鏀粯瀹屾垚瓒呰繃15鍒嗛挓
+ min = (nowTime.getTime() - payTime.getTime()) / (60 * 1000* 1.00);
+
+ return new Double(Math.ceil(min)).longValue();
+ //return (nowTime.getTime() - payTime.getTime()) / (60 * 1000);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return 0;
+ }
+
+ /**
+ * 鍒ゆ柇 鐢ㄦ埛鏄敮浠樺畬鎴�
+ *
+ * @param carInoutDto
+ * @return
+ */
public static long getTempCarMin(CarInoutDto carInoutDto) {
//鏀粯鏃堕棿鏄惁瓒呰繃15鍒嗛挓
@@ -67,10 +102,8 @@
}
Date nowTime = DateUtil.getCurrentDate();
//鏀粯瀹屾垚瓒呰繃15鍒嗛挓
- min = (nowTime.getTime() - payTime.getTime()) / (60 * 1000);
- return new Double(Math.ceil(min)).longValue();
- //return (nowTime.getTime() - payTime.getTime()) / (60 * 1000);
+ return (nowTime.getTime() - payTime.getTime()) / (60 * 1000);
} catch (ParseException e) {
e.printStackTrace();
}
--
Gitblit v1.8.0