From f32cc15f60bf3b5c47267ee256a0deb3bdd01eec Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 23 四月 2020 14:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/user/UserLevelUtil.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 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 cc67a6e..d209a14 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,6 +22,25 @@
}
return null;
}
+
+
+ /**
+ * 鏍规嵁鏋氫妇鍚嶇О鍖归厤
+ * @param level
+ * @return
+ */
+ public static UserLevelEnum getByEnumName(String level) {
+ if (level == null)
+ return null;
+
+ for (UserLevelEnum levelEnum : UserLevelEnum.values()) {
+ if (levelEnum.name().equalsIgnoreCase(level))
+ return levelEnum;
+ }
+ return null;
+ }
+
+
/**
* 鏍规嵁绛夌骇鏁板瓧
@@ -42,7 +57,7 @@
}
return null;
}
-
+
/**
* 鏍规嵁璁㈠崟rank鑾峰彇鐢ㄦ埛鐨勭瓑绾�
* @Title: getByOrderRank
@@ -77,8 +92,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;
@@ -103,10 +116,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;
}
@@ -124,7 +135,7 @@
*/
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;
--
Gitblit v1.8.0