From d7f7dfe84c9b7624d74fa9c08d3563b549317ce0 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期六, 26 一月 2019 16:04:32 +0800
Subject: [PATCH] 等级更新时间 当月1号

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 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..7c5bef2 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,7 @@
 package com.yeshi.fanli.service.impl.user;
 
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -64,7 +65,7 @@
 			throw new UserInfoExtraException(1, "鐢ㄦ埛闄勫姞淇℃伅涓嶅瓨鍦�");
 		}
 
-		// 绛夌骇瀵圭収琛�
+		// 绛夌骇瀵圭収琛� 
 		String contrast = configService.get("user_rank_contrast");
 		extraVO.setRankContrast(contrast);
 		// 鐗瑰埆鎻愰啋
@@ -72,7 +73,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) {
@@ -223,13 +228,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 +343,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