From b22f741e6918c675fabe5aabc688d2f52858319a Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 09 十月 2023 09:46:43 +0800
Subject: [PATCH] #pgsql 退款 结算
---
server/services/src/main/java/com/doumee/core/utils/DateUtil.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/utils/DateUtil.java b/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
index d51d0f6..88f215a 100644
--- a/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -10,7 +10,6 @@
import java.text.DateFormatSymbols;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.time.Duration;
import java.util.Date;
import java.util.*;
@@ -3011,11 +3010,11 @@
* @param end
* @return
*/
- public static long betweenMin(Date begin, Date end) {
+ public static Integer betweenMin(Date begin, Date end) {
long createTime =begin.getTime();//鑾峰彇鍒涘缓鏃堕棿鐨勬椂闂存埑
long currentTime =Objects.isNull(end)?System.currentTimeMillis():end.getTime();//鑾峰彇褰撳墠鏃堕棿鐨勬椂闂存埑
long diff=(currentTime-createTime)/1000/60;//鑾峰彇涓や釜鏃堕棿鐩稿樊鐨勫垎閽�
- return diff;
+ return (int)diff;
}
@@ -3038,4 +3037,4 @@
return consuming.toString();
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3