From 1258285449fda19e366ace1ce531ea2e2e8799a9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 28 四月 2020 15:12:54 +0800
Subject: [PATCH] 新规则生效时间修改，基础佣金比例bug修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteServiceImpl.java | 67 +++++++++++++++++----------------
1 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteServiceImpl.java
index d0b7c94..ef68413 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteServiceImpl.java
@@ -15,6 +15,7 @@
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
import com.yeshi.fanli.service.inter.user.vip.UserVIPPreInfoService;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.user.UserLevelUtil;
@Service
public class UserInviteServiceImpl implements UserInviteService {
@@ -23,14 +24,12 @@
@Resource
private UserVIPInfoService userVIPInfoService;
-
+
@Resource
private UserVIPPreInfoService userVIPPreInfoService;
-
+
@Resource
private UserVIPLevelMapper userVIPLevelMapper;
-
-
@Override
public UserInviteLevelEnum getUserInviteLevel(Long uid) {
@@ -44,68 +43,72 @@
if (info.getState() == UserVIPInfo.STATE_VERIFING)
return UserInviteLevelEnum.vipApply;
-
// TODO 娌℃湁鍒ゆ柇瀵煎笀
return UserInviteLevelEnum.vip;
}
-
@Override
public UserInviteLevelEnum getUserInviteLevelNew(Long uid) {
String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
if (StringUtil.isNullOrEmpty(inviteCode)) {
return UserInviteLevelEnum.noActive;
}
-
- UserVIPInfo info = userVIPInfoService.selectByUid(uid);
- if (info == null) {
- UserVIPPreInfo userVIPPreInfo = userVIPPreInfoService.getLatestProcessInfo(uid);
- if (userVIPPreInfo != null) {
- if (userVIPPreInfo.getProcess() == UserVIPPreInfo.PROCESS_1) {
- return UserInviteLevelEnum.normalVIP;
- } else if (userVIPPreInfo.getProcess() == UserVIPPreInfo.PROCESS_2) {
- return UserInviteLevelEnum.highVIP;
- }
+
+ UserVIPPreInfo userVIPPreInfo = userVIPPreInfoService.getLatestProcessInfo(uid);
+ if (userVIPPreInfo != null) {
+ Integer process = userVIPPreInfo.getProcess();
+ UserLevelEnum levelEnum = UserLevelUtil.getByLevel(process);
+
+ levelEnum = UserLevelUtil.getShowLevel(levelEnum);
+ if (levelEnum == null || levelEnum == UserLevelEnum.daRen) {
+ return UserInviteLevelEnum.actived;
}
- } else if (info.getState() == UserVIPInfo.STATE_VERIFING) {
- return UserInviteLevelEnum.vipApply;
- } else if (info.getState() == UserVIPInfo.STATE_SUCCESS) {
- return UserInviteLevelEnum.vip;
+
+ if (levelEnum == UserLevelEnum.highVIP) {
+ UserVIPInfo info = userVIPInfoService.selectByUid(uid);
+ if (info != null && info.getState() == UserVIPInfo.STATE_VERIFING) {
+ return UserInviteLevelEnum.vipApply;
+ }
+ return UserInviteLevelEnum.highVIP;
+ }
+
+ if (levelEnum == UserLevelEnum.superVIP) {
+ return UserInviteLevelEnum.vip;
+ }
+
+ if (levelEnum == UserLevelEnum.tearcher) {
+ return UserInviteLevelEnum.tearcher;
+ }
}
-
- // TODO 娌℃湁鍒ゆ柇瀵煎笀
-
return UserInviteLevelEnum.actived;
}
-
@Override
public boolean verifyVIP(Long uid) {
String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
if (StringUtil.isNullOrEmpty(inviteCode)) {
return false;
}
-
+
UserVIPInfo info = userVIPInfoService.selectByUid(uid);
if (info != null && info.getState() == UserVIPInfo.STATE_SUCCESS) {
return true;
}
-
+
UserVIPPreInfo userVIPPreInfo = userVIPPreInfoService.getLatestProcessInfo(uid);
if (userVIPPreInfo != null) {
+ if (userVIPPreInfo.getProcess() == UserVIPPreInfo.PROCESS_1) {
+ return false;
+ }
return true;
}
-
return false;
}
-
-
-
+
@Override
public UserVIPLevel getVIPLevelByUid(Long uid) {
return userVIPLevelMapper.getLevelByUid(uid);
}
-
-
+
}
--
Gitblit v1.8.0