From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/util/user/UserLevelUtil.java | 49 ++++++++++++++++++++++---------------------------
1 files changed, 22 insertions(+), 27 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 d209a14..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,26 +4,7 @@
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();
- }
-
- if (orderRank == UserLevelEnum.superVIP.getOrderRank()) {
- return UserLevelEnum.superVIP.getName();
- }
-
- if (orderRank == UserLevelEnum.tearcher.getOrderRank()) {
- return UserLevelEnum.tearcher.getName();
- }
- return null;
- }
-
-
/**
* 鏍规嵁鏋氫妇鍚嶇О鍖归厤
* @param level
@@ -39,8 +20,6 @@
}
return null;
}
-
-
/**
* 鏍规嵁绛夌骇鏁板瓧
@@ -67,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;
}
/**
@@ -91,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;
@@ -114,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;
@@ -135,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