From f7ed4e6bbe9be95d268481e66d70d90e70e07e12 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 28 一月 2019 19:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java
index 7efd7ba..1f1c62b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java
@@ -1,6 +1,8 @@
package com.yeshi.fanli.service.impl.user;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -139,8 +141,11 @@
if (userInfoExtra != null && userInfoExtra.getId() != null) {
// 鍒ゆ柇褰撴湀鏄惁宸叉洿鏂�
Date rankUpdateTime = userInfoExtra.getRankUpdateTime();
- if (rankUpdateTime != null && DateUtil.isSameMonth(rankUpdateTime, new Date())) {
- isupdateRank = false;
+ if (rankUpdateTime != null) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+ if (sdf.format(rankUpdateTime).equals(sdf.format(new Date()))) {
+ isupdateRank = false;
+ }
}
} else {
userInfoExtra = new UserInfoExtra();
@@ -232,8 +237,12 @@
break;
}
}
- // 绛夌骇鏇存柊鏃堕棿
- userInfoExtra.setRankUpdateTime(new Date());
+
+ // 绛夌骇鏇存柊鏃堕棿 褰撴湀1鍙�
+ Calendar calendar1=Calendar.getInstance();
+ calendar1.set(Calendar.DAY_OF_MONTH, 1);
+ userInfoExtra.setRankUpdateTime(calendar1.getTime());
+
// 淇濆瓨淇℃伅骞惰繑鍥�
saveUserInfoExtra(userInfoExtra);
--
Gitblit v1.8.0