From 51c0049fb70c85bf515dc0fecd96bf13ca23aa28 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 24 四月 2020 18:37:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/user/UserLevelUtil.java | 24 +++---------------------
1 files changed, 3 insertions(+), 21 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 ca829bb..b7babbe 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,24 +4,6 @@
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;
- }
/**
* 鏍规嵁鏋氫妇鍚嶇О鍖归厤
@@ -88,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;
@@ -111,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;
@@ -132,7 +114,7 @@
*/
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;
--
Gitblit v1.8.0