From 84fe3e6e6ef96f6fbc000c46a9ad64b308b0a85d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 23 七月 2021 19:40:49 +0800
Subject: [PATCH] 优化 欠费催缴功能

---
 java110-utils/src/main/java/com/java110/utils/util/DateUtil.java |   87 +++++++++++++++++++++++++++++++++++++++----
 1 files changed, 79 insertions(+), 8 deletions(-)

diff --git a/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java b/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
old mode 100644
new mode 100755
index 3d6bc65..b5ff030
--- a/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
@@ -347,16 +347,22 @@
         return returndate;
     }
 
+    public static Date getNextMonthFirstDate() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.DAY_OF_MONTH, 1);
+        calendar.add(Calendar.MONTH, 1);
+        return calendar.getTime();
+    }
+
+    public static Date getFirstDate() {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.DAY_OF_MONTH, 1);
+        return calendar.getTime();
+    }
+
     public static String getNextMonthFirstDay(String fmt) {
         String returndate = "";
-        Date date = null;
-
-        Calendar cl = Calendar.getInstance();
-        cl.set(2, cl.get(2) + 1);
-        cl.set(5, 1);
-
-        date = cl.getTime();
-
+        Date date = getNextMonthFirstDate();
         returndate = getFormatTimeString(date, fmt);
 
         return returndate;
@@ -426,4 +432,69 @@
 
         return dateStr;
     }
+
+
+    public static int getYear() {
+        Date date = getCurrentDate();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        return calendar.get(Calendar.YEAR);
+    }
+
+    public static int getMonth() {
+        Date date = getCurrentDate();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        return calendar.get(Calendar.MONTH) + 1;
+    }
+
+    /**
+     * 鍒ゆ柇鏃堕棿鏄惁鍦ㄦ椂闂存鍐�
+     *
+     * @param nowTime
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    public static boolean belongCalendar(Date nowTime, Date beginTime, Date endTime) {
+        Calendar date = Calendar.getInstance();
+        date.setTime(nowTime);
+        Calendar begin = Calendar.getInstance();
+        begin.setTime(beginTime);
+        Calendar end = Calendar.getInstance();
+        end.setTime(endTime);
+        if (date.after(begin) && date.before(end)) {
+            return true;
+        } else if (nowTime.compareTo(beginTime) == 0 || nowTime.compareTo(endTime) == 0) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    //鑾峰彇涓や釜鏃ユ湡涔嬮棿鐨勫ぉ鏁�
+    public static int daysBetween(Date now, Date returnDate) {
+        Calendar cNow = Calendar.getInstance();
+        Calendar cReturnDate = Calendar.getInstance();
+        cNow.setTime(now);
+        cReturnDate.setTime(returnDate);
+        setTimeToMidnight(cNow);
+        setTimeToMidnight(cReturnDate);
+        long todayMs = cNow.getTimeInMillis();
+        long returnMs = cReturnDate.getTimeInMillis();
+        long intervalMs = todayMs - returnMs;
+        return millisecondsToDays(intervalMs);
+    }
+
+    //鑾峰彇涓や釜鏃ユ湡涔嬮棿鐨勬绉掓暟
+    private static void setTimeToMidnight(Calendar calendar) {
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+    }
+
+    //鑾峰彇涓や釜鏃ユ湡涔嬮棿鐨勫垎閽熸暟
+    private static int millisecondsToDays(long intervalMs) {
+        return (int) (intervalMs / (1000 * 86400));
+    }
 }

--
Gitblit v1.8.0