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 | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 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 faf6869..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;
@@ -64,7 +66,7 @@
throw new UserInfoExtraException(1, "鐢ㄦ埛闄勫姞淇℃伅涓嶅瓨鍦�");
}
- // 绛夌骇瀵圭収琛�
+ // 绛夌骇瀵圭収琛�
String contrast = configService.get("user_rank_contrast");
extraVO.setRankContrast(contrast);
// 鐗瑰埆鎻愰啋
@@ -72,7 +74,11 @@
extraVO.setRankTip(rankTip);
Integer rankOrderNum = extraVO.getRankOrderNum();
- if (rankOrderNum != null && rankOrderNum > 0) {
+
+ UserRank userRank = extraVO.getUserRank();
+ // 闈掗摐绛夌骇涓嶈繑鍥炴伃鍠滆鍙� 娉細闈掗摐绛夌骇id 蹇呴』涓�1
+ if (userRank != null && userRank.getId() != null && userRank.getId() > 1) {
+
String rankMsg = null;
Integer rankSource = extraVO.getRankSource();
switch (rankSource) {
@@ -135,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();
@@ -223,13 +232,17 @@
rank = userRank;
// 榛樿鏈�浣庣瓑绾�:闈掗摐
userInfoExtra.setUserRank(rank);
- userInfoExtra.setRankOrderNum(0);
+ userInfoExtra.setRankOrderNum(selfOrderNum);
userInfoExtra.setRankSource(Constant.TYPE_REBATE);
break;
}
}
- // 绛夌骇鏇存柊鏃堕棿
- userInfoExtra.setRankUpdateTime(new Date());
+
+ // 绛夌骇鏇存柊鏃堕棿 褰撴湀1鍙�
+ Calendar calendar1=Calendar.getInstance();
+ calendar1.set(Calendar.DAY_OF_MONTH, 1);
+ userInfoExtra.setRankUpdateTime(calendar1.getTime());
+
// 淇濆瓨淇℃伅骞惰繑鍥�
saveUserInfoExtra(userInfoExtra);
@@ -334,6 +347,12 @@
}
@Override
+ public UserInfoExtraVO getInfoExtraVOByUid(Long uid) {
+ return userInfoExtraMapper.getInfoExtraVOByUid(uid);
+ }
+
+
+ @Override
public String getUserInviteCode(Long uid) throws UserInfoExtraException {
UserInfoExtra userInfoExtra = userInfoExtraMapper.getInfoExtraByUid(uid);
--
Gitblit v1.8.0