From 45e060f8d38bcf473909c9a2fd40785dd1d1e98a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 29 八月 2022 01:01:27 +0800
Subject: [PATCH] 优化临时停车费秒的问题

---
 java110-core/src/main/java/com/java110/core/factory/TempCarFeeFactory.java |   35 ++++++++++++++++++++++++++++++++++-
 1 files changed, 34 insertions(+), 1 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..1f6eb80 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
@@ -48,7 +48,7 @@
      * @param carInoutDto
      * @return
      */
-    public static long getTempCarMin(CarInoutDto carInoutDto) {
+    public static long getTempCarCeilMin(CarInoutDto carInoutDto) {
 
         //鏀粯鏃堕棿鏄惁瓒呰繃15鍒嗛挓
         Date payTime = null;
@@ -77,6 +77,39 @@
         return 0;
     }
 
+    /**
+     * 鍒ゆ柇 鐢ㄦ埛鏄敮浠樺畬鎴�
+     *
+     * @param carInoutDto
+     * @return
+     */
+    public static long getTempCarMin(CarInoutDto carInoutDto) {
+
+        //鏀粯鏃堕棿鏄惁瓒呰繃15鍒嗛挓
+        Date payTime = null;
+        double min = 0.0;
+        try {
+            //涓嶆槸鏀粯瀹屾垚 鐘舵��
+            if (CarInoutDto.STATE_PAY.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鍒嗛挓
+
+            return (nowTime.getTime() - payTime.getTime()) / (60 * 1000);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return 0;
+    }
+
     public static double getAttrValueDouble(List<TempCarFeeConfigAttrDto> tempCarFeeConfigAttrDtos, String specCd) {
 
         for (TempCarFeeConfigAttrDto tempCarFeeConfigAttrDto : tempCarFeeConfigAttrDtos) {

--
Gitblit v1.8.0