From fb2faf11c5607cffc34480228e346609d7bb5b42 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 07 十二月 2019 18:14:23 +0800
Subject: [PATCH] 会员奖励

---
 utils/src/main/java/org/yeshi/utils/DateUtil.java |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/utils/src/main/java/org/yeshi/utils/DateUtil.java b/utils/src/main/java/org/yeshi/utils/DateUtil.java
index 82ef3d4..abeb00b 100644
--- a/utils/src/main/java/org/yeshi/utils/DateUtil.java
+++ b/utils/src/main/java/org/yeshi/utils/DateUtil.java
@@ -85,6 +85,34 @@
 		dateInfo.setSecond(second);
 		return dateInfo;
 	}
+	
+	public static String dateDiff4(Date startTime, Date endTime) throws Exception {
+
+		String datatime = "0鍒�";
+
+		long nm = 1000 * 60;// 涓�鍒嗛挓鐨勬绉掓暟
+		long nh = 1000 * 60 * 60;// 涓�灏忔椂鐨勬绉掓暟
+		long nd = 1000 * 24 * 60 * 60;// 涓�澶╃殑姣鏁�
+
+		// 鑾峰緱涓や釜鏃堕棿鐨勬绉掓椂闂村樊寮�
+		long diff = endTime.getTime() - startTime.getTime();
+		long day = diff / nd;// 璁$畻宸灏戝ぉ
+		long hour = diff % nd / nh;// 璁$畻宸灏戝皬鏃�
+		long min = diff % nd % nh / nm;// 璁$畻宸灏戝垎閽�
+
+		if (day > 0) {
+			datatime = day + "澶�";
+		} else {
+			if (hour > 0) {
+				datatime = hour + "鏃�";
+			} else {
+				if (min < 0)
+					min = 0;
+				datatime = min + "鍒�";
+			}
+		}
+		return datatime;
+	}
 
 	/**
 	 * 閫氳繃鏃堕棿绉掓绉掓暟鍒ゆ柇涓や釜鏃堕棿鐨勯棿闅�

--
Gitblit v1.8.0