From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/count/DailyCountCouponServiceImpl.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/DailyCountCouponServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/DailyCountCouponServiceImpl.java
index 3d85b2a..6c29c8a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/DailyCountCouponServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/DailyCountCouponServiceImpl.java
@@ -89,7 +89,8 @@
 	 * @param typeEnum
 	 * @throws Exception
 	 */
-	private void initData(DailyCountCouponEnum typeEnum) throws Exception {
+	@Override
+	public void initData(DailyCountCouponEnum typeEnum) throws Exception {
 		Date lastDate = null;
 		DailyCountCoupon lastRecord = dailyCountCouponDao.getMaxDate(typeEnum);
 		if (lastRecord != null) {
@@ -97,6 +98,12 @@
 		} else {
 			lastDate = TimeUtil.parse("2019-03-04");
 		}
+		
+		long min = DateUtil.dateDiffMin(lastDate, new Date());
+		if (min <= 10) { // 10鍒嗛挓浠ュ唴涓嶇粺璁�
+			return;
+		}
+		
 
 		Date today = new Date();
 		int betweenDays = DateUtil.daysBetween2(lastDate, today);

--
Gitblit v1.8.0