From 24a8d17e007545f7426c48352109aa1a9c6587ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 五月 2020 12:02:09 +0800
Subject: [PATCH] IOS上线隐藏我的界面的banner与超级会员升级信息

---
 fanli/src/main/java/com/yeshi/fanli/util/user/UserLevelUtil.java |   52 +++++++++++++++++++++++++++++++++-------------------
 1 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/user/UserLevelUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/user/UserLevelUtil.java
index 5f57f78..ee1b330 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/user/UserLevelUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/user/UserLevelUtil.java
@@ -4,21 +4,19 @@
 
 public class UserLevelUtil {
 
-	public static String getLevelName(int orderRank) {
-		if (orderRank == UserLevelEnum.daRen.getOrderRank()) {
-			return UserLevelEnum.daRen.getName();
-		}
 
-		if (orderRank == UserLevelEnum.highVIP.getOrderRank()) {
-			return UserLevelEnum.highVIP.getName();
-		}
+	/**
+	 * 鏍规嵁鏋氫妇鍚嶇О鍖归厤
+	 * @param level
+	 * @return
+	 */
+	public static UserLevelEnum getByEnumName(String level) {
+		if (level == null)
+			return null;
 
-		if (orderRank == UserLevelEnum.superVIP.getOrderRank()) {
-			return UserLevelEnum.superVIP.getName();
-		}
-
-		if (orderRank == UserLevelEnum.tearcher.getOrderRank()) {
-			return UserLevelEnum.tearcher.getName();
+		for (UserLevelEnum levelEnum : UserLevelEnum.values()) {
+			if (levelEnum.name().equalsIgnoreCase(level))
+				return levelEnum;
 		}
 		return null;
 	}
@@ -48,15 +46,15 @@
 	 * UserLevelEnum 杩斿洖绫诲瀷
 	 * @throws
 	 */
-	public static UserLevelEnum getByOrderRank(Integer orderRank) {
+	public static UserLevelEnum getByOrderRank(Integer orderRank) {//鍏朵粬缁撴灉杩斿洖杈句汉
 		if (orderRank == null)
-			return null;
+			return UserLevelEnum.daRen;
 
 		for (UserLevelEnum level : UserLevelEnum.values()) {
 			if (level.getOrderRank() == orderRank)
 				return level;
 		}
-		return null;
+		return UserLevelEnum.daRen;
 	}
 
 	/**
@@ -72,7 +70,7 @@
 		if (level == null)
 			return null;
 
-		if (level == UserLevelEnum.daRen) {
+		if (level == UserLevelEnum.daRen || level == UserLevelEnum.normalVIP) {
 			return UserLevelEnum.highVIP;
 		} else if (level == UserLevelEnum.highVIP) {
 			return UserLevelEnum.superVIP;
@@ -95,7 +93,7 @@
 	public static UserLevelEnum getPrevLevel(UserLevelEnum level) {
 		if (level == null)
 			return null;
-		if (level == UserLevelEnum.daRen) {
+		if (level == UserLevelEnum.daRen || level == UserLevelEnum.normalVIP) {
 			return null;
 		} else if (level == UserLevelEnum.highVIP) {
 			return UserLevelEnum.daRen;
@@ -116,10 +114,26 @@
 	 */
 
 	public static UserLevelEnum getOldLevel(UserLevelEnum userLevel) {
-		if (userLevel == null || userLevel == UserLevelEnum.highVIP) {
+		if (userLevel == null || userLevel == UserLevelEnum.normalVIP || userLevel == UserLevelEnum.highVIP) {
 			return UserLevelEnum.daRen;
 		} else if (userLevel == UserLevelEnum.tearcher)
 			return UserLevelEnum.superVIP;
 		return userLevel;
 	}
+
+	/**
+	 * 鑾峰彇澶栨樉绛夌骇
+	 * @Title: getShowLevel
+	 * @Description: 
+	 * @param userLevel
+	 * @return 
+	 * UserLevelEnum 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public static UserLevelEnum getShowLevel(UserLevelEnum userLevel) {
+		if (userLevel == UserLevelEnum.normalVIP)
+			return UserLevelEnum.daRen;
+
+		return userLevel;
+	}
 }

--
Gitblit v1.8.0