From 498db5b387d50dc76be41498200fa06d4e1def95 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 17 四月 2020 14:02:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java
index e0838ab..4fa2f0b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java
@@ -47,6 +47,7 @@
 import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
 import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService;
 
 @Service
@@ -371,7 +372,7 @@
 			if (userInfoRegister != null && userInfoRegister.getCreateTime() != null) {
 				registerTime = userInfoRegister.getCreateTime();
 			}
-			int daysBetween = DateUtil.daysBetween(registerTime, new Date());
+			int daysBetween = TimeUtil.getDayDifferenceCount(registerTime, new Date());
 			userAccountMsgNotificationService.vipPreUpgrade(uid, "蹇渷杈句汉", "鏅�氫細鍛�", daysBetween, limit1, limit2, type);
 			
 			// 鍗囩骇寮规鎻愮ず
@@ -457,7 +458,7 @@
 				if (userInfoRegister != null && userInfoRegister.getCreateTime() != null) {
 					registerTime = userInfoRegister.getCreateTime();
 				}
-				daysBetween = DateUtil.daysBetween(registerTime, upgradeTime);
+				daysBetween = TimeUtil.getDayDifferenceCount(registerTime, upgradeTime);
 				
 				// 閲戝竵濂栧姳 锛堢洿鎺ュ崌绾ч珮绾т細鍛樿ˉ榻愪竴绾у鍔憋級
 				goldcoinReward(uid);

--
Gitblit v1.8.0