From 4637d6f780c76f1c5a0f95922c658efe8174be8f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 18:34:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java
index 458ab2a..fddba37 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java
@@ -29,6 +29,7 @@
import com.yeshi.fanli.entity.bus.user.UserInviteSeparate;
import com.yeshi.fanli.entity.bus.user.UserInviteValidRecord;
import com.yeshi.fanli.entity.bus.user.WeiXinUser;
+import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.system.SystemClientParams;
@@ -458,7 +459,6 @@
}
}
-
// 閭�璇锋垚鍔熸椂闂�
Long succeedTime = threeSale.getSucceedTime();
if (succeedTime == null) {
@@ -489,24 +489,30 @@
array.add(loginJson);
// 鏌ヨ绮変笣绛夌骇
- UserInviteLevelEnum level = null;
+ UserLevelEnum level = null;
+ UserInviteLevelEnum inviteLevel = null;
UserVIPLevel vipLevel = userInviteService.getVIPLevelByUid(workerId);
- if (vipLevel != null) {
- if (vipLevel.getLevel() == UserVIPLevel.LEVEL_3) {
- level = UserInviteLevelEnum.actived;
- } else if (vipLevel.getLevel() == UserVIPLevel.LEVEL_7) {
- level = UserInviteLevelEnum.actived;
- } else if (vipLevel.getLevel() == UserVIPLevel.LEVEL_10) {
- level = UserInviteLevelEnum.actived;
+ if (vipLevel != null && vipLevel.getLevelEnum() != null) {
+ inviteLevel = vipLevel.getLevelEnum();
+ if (UserInviteLevelEnum.vipPre1 == inviteLevel) {
+ level = UserLevelEnum.normalVIP;
+ } else if (UserInviteLevelEnum.vipPre2 == inviteLevel || UserInviteLevelEnum.vipApply == inviteLevel) {
+ level = UserLevelEnum.highVIP;
+ inviteLevel = UserInviteLevelEnum.vipPre2;
+ } else if (UserInviteLevelEnum.vip == inviteLevel || UserInviteLevelEnum.tearcherApply == inviteLevel) {
+ level = UserLevelEnum.superVIP;
+ inviteLevel = UserInviteLevelEnum.vip;
+ } else if (UserInviteLevelEnum.tearcher == inviteLevel ) {
+ level = UserLevelEnum.tearcher;
}
}
if(level == null) {
- if (userInfoExtra == null || StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {
- level = UserInviteLevelEnum.noActive;
- } else {
- level = UserInviteLevelEnum.actived;
- }
+ level = UserLevelEnum.daRen;
+ }
+
+ if (inviteLevel == null) {
+ inviteLevel = UserInviteLevelEnum.actived;
}
@@ -518,7 +524,7 @@
object.put("inviteTime", format.format(new Date(succeedTime)) + " 鍔犲叆");
object.put("state", state? 1 : 2);
object.put("recentMsg", array);
- object.put("level", level.name());
+ object.put("level", inviteLevel.name());
object.put("validFans", validFans);
--
Gitblit v1.8.0