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 |   46 ++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/utils/src/main/java/org/yeshi/utils/DateUtil.java b/utils/src/main/java/org/yeshi/utils/DateUtil.java
index 65596e2..7030788 100644
--- a/utils/src/main/java/org/yeshi/utils/DateUtil.java
+++ b/utils/src/main/java/org/yeshi/utils/DateUtil.java
@@ -2,8 +2,10 @@
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 
 public class DateUtil {
 
@@ -52,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);
@@ -92,7 +104,7 @@
 			return false;
 		}
 	}
-
+	
 	/**
 	 * 鎸囧畾鏃ユ湡鍔犱笂澶╂暟鍚庣殑鏃ユ湡
 	 * 
@@ -134,4 +146,34 @@
 		
 		return format.format(ca.getTime());
 	}
+	
+	/**
+	 * 杩斿洖涓棿鏃ユ湡
+	 * @param startTime
+	 * @param endTime
+	 * @return
+	 * @throws Exception
+	 */
+	public static List<String> dayFactory(String startTime, String endTime) throws Exception {
+
+		List<String> listDate = new ArrayList<String>();
+
+		String plusDay = "";
+		for (int i = 0; i < 1000; i++) {
+			if (i == 0) {
+				plusDay = startTime;
+			} else {
+				plusDay = DateUtil.plusDay(i, startTime);
+			}
+
+			listDate.add(plusDay);
+
+			if (plusDay.equals(endTime)) {
+				break; // 鏃堕棿缁撴潫
+			}
+		}
+		return listDate;
+	}
+	
+	
 }
\ No newline at end of file

--
Gitblit v1.8.0