From 8b37d2f16d4aa7c7ce19829b74307ae0072b127f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 25 二月 2019 10:44:55 +0800
Subject: [PATCH] 1.5.1 奖励券、免单券
---
utils/src/main/java/org/yeshi/utils/DateUtil.java | 50 ++++++++++++--------------------------------------
1 files changed, 12 insertions(+), 38 deletions(-)
diff --git a/utils/src/main/java/org/yeshi/utils/DateUtil.java b/utils/src/main/java/org/yeshi/utils/DateUtil.java
index 3cfbc90..7030788 100644
--- a/utils/src/main/java/org/yeshi/utils/DateUtil.java
+++ b/utils/src/main/java/org/yeshi/utils/DateUtil.java
@@ -54,7 +54,17 @@
return datatime;
}
-
+
+ /**
+ * 閫氳繃鏃堕棿绉掓绉掓暟鍒ゆ柇涓や釜鏃堕棿鐨勯棿闅�
+ * @param date1
+ * @param date2
+ * @return
+ */
+ public static int differentDaysByMillisecond(Date start, Date end) {
+ return (int) ((end.getTime() - start.getTime()) / (1000*3600*24));
+ }
+
public String transferLongToDate(String dateFormat, Long millSec) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date = new Date(millSec);
@@ -95,42 +105,6 @@
}
}
-
- /**
- * 楠岃瘉鏄惁灞炰簬鍚屼竴澶�
- *
- * @param Date1
- * @param Date2
- * @return
- */
- public static boolean isSameMonth(Date date1, Date date2) {
- if (date1 != null && date2 != null) {
- Calendar cal1 = Calendar.getInstance();
- cal1.setTime(date1);
- Calendar cal2 = Calendar.getInstance();
- cal2.setTime(date2);
- return isSameMonth(cal1, cal2);
- } else {
- return false;
- }
- }
-
- /**
- * 楠岃瘉鏄惁灞炰簬鍚屽勾鍚屾湀
- *
- * @param cal1
- * @param cal2
- * @return
- */
- public static boolean isSameMonth(Calendar cal1, Calendar cal2) {
- if (cal1 != null && cal2 != null) {
- return cal1.get(0) == cal2.get(0) && cal1.get(1) == cal2.get(1) && cal1.get(6) == cal2.get(6);
- } else {
- return false;
- }
- }
-
-
/**
* 鎸囧畾鏃ユ湡鍔犱笂澶╂暟鍚庣殑鏃ユ湡
*
@@ -198,8 +172,8 @@
break; // 鏃堕棿缁撴潫
}
}
-
return listDate;
}
+
}
\ No newline at end of file
--
Gitblit v1.8.0