From d516e38fd44e186f393bbb05c4e7ca34b323b609 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 16 五月 2023 18:50:52 +0800
Subject: [PATCH] optimize report

---
 java110-core/src/main/java/com/java110/core/factory/TempCarFeeFactory.java |   37 +++++++++++++++++++++++++++++++++++++
 1 files changed, 37 insertions(+), 0 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 1c273da..6b8a192 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,10 +48,46 @@
      * @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鍒嗛挓
         Date payTime = null;
+        double min = 0.0;
         try {
             //涓嶆槸鏀粯瀹屾垚 鐘舵��
             if (CarInoutDto.STATE_PAY.equals(carInoutDto.getState())) {
@@ -66,6 +102,7 @@
             }
             Date nowTime = DateUtil.getCurrentDate();
             //鏀粯瀹屾垚瓒呰繃15鍒嗛挓
+
             return (nowTime.getTime() - payTime.getTime()) / (60 * 1000);
         } catch (ParseException e) {
             e.printStackTrace();

--
Gitblit v1.8.0