From afb85211ae10481f73a4809964ebb7b11e923ff0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 24 四月 2020 18:37:18 +0800
Subject: [PATCH] 站内信修改

---
 fanli/src/main/java/com/yeshi/fanli/util/user/UserLevelUtil.java |   35 ++++++++++++++++++++---------------
 1 files changed, 20 insertions(+), 15 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 ed4dcc4..ca829bb 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
@@ -9,10 +9,6 @@
 			return UserLevelEnum.daRen.getName();
 		}
 
-		if (orderRank == UserLevelEnum.normalVIP.getOrderRank()) {
-			return UserLevelEnum.normalVIP.getName();
-		}
-
 		if (orderRank == UserLevelEnum.highVIP.getOrderRank()) {
 			return UserLevelEnum.highVIP.getName();
 		}
@@ -26,8 +22,7 @@
 		}
 		return null;
 	}
-	
-	
+
 	/**
 	 * 鏍规嵁鏋氫妇鍚嶇О鍖归厤
 	 * @param level
@@ -43,8 +38,6 @@
 		}
 		return null;
 	}
-	
-	
 
 	/**
 	 * 鏍规嵁绛夌骇鏁板瓧
@@ -61,7 +54,7 @@
 		}
 		return null;
 	}
-	
+
 	/**
 	 * 鏍规嵁璁㈠崟rank鑾峰彇鐢ㄦ埛鐨勭瓑绾�
 	 * @Title: getByOrderRank
@@ -96,8 +89,6 @@
 			return null;
 
 		if (level == UserLevelEnum.daRen) {
-			return UserLevelEnum.normalVIP;
-		} else if (level == UserLevelEnum.normalVIP) {
 			return UserLevelEnum.highVIP;
 		} else if (level == UserLevelEnum.highVIP) {
 			return UserLevelEnum.superVIP;
@@ -122,10 +113,8 @@
 			return null;
 		if (level == UserLevelEnum.daRen) {
 			return null;
-		} else if (level == UserLevelEnum.normalVIP) {
-			return UserLevelEnum.daRen;
 		} else if (level == UserLevelEnum.highVIP) {
-			return UserLevelEnum.normalVIP;
+			return UserLevelEnum.daRen;
 		} else if (level == UserLevelEnum.superVIP) {
 			return UserLevelEnum.highVIP;
 		}
@@ -143,10 +132,26 @@
 	 */
 
 	public static UserLevelEnum getOldLevel(UserLevelEnum userLevel) {
-		if (userLevel == null || userLevel == UserLevelEnum.normalVIP || userLevel == UserLevelEnum.highVIP) {
+		if (userLevel == null || 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