From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteServiceImpl.java | 69 ++++++++++++++++++++++++++++++++++
1 files changed, 69 insertions(+), 0 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 9654b6a..3587593 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
@@ -4,11 +4,15 @@
import org.springframework.stereotype.Service;
+import com.yeshi.fanli.dao.mybatis.user.vip.UserVIPLevelMapper;
import com.yeshi.fanli.dto.user.UserInviteLevelEnum;
+import com.yeshi.fanli.dto.vip.UserVIPLevel;
import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;
+import com.yeshi.fanli.entity.bus.user.vip.UserVIPPreInfo;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.invite.UserInviteService;
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
+import com.yeshi.fanli.service.inter.user.vip.UserVIPPreInfoService;
import com.yeshi.fanli.util.StringUtil;
@Service
@@ -18,6 +22,14 @@
@Resource
private UserVIPInfoService userVIPInfoService;
+
+ @Resource
+ private UserVIPPreInfoService userVIPPreInfoService;
+
+ @Resource
+ private UserVIPLevelMapper userVIPLevelMapper;
+
+
@Override
public UserInviteLevelEnum getUserInviteLevel(Long uid) {
@@ -31,9 +43,66 @@
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.vipPre1;
+ } else if (userVIPPreInfo.getProcess() == UserVIPPreInfo.PROCESS_2) {
+ return UserInviteLevelEnum.vipPre2;
+ }
+ }
+ } else if (info.getState() == UserVIPInfo.STATE_VERIFING) {
+ return UserInviteLevelEnum.vipApply;
+ } else if (info.getState() == UserVIPInfo.STATE_SUCCESS) {
+ return UserInviteLevelEnum.vip;
+ }
+
+ // 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) {
+ return true;
+ }
+
+ return false;
+ }
+
+
+
+ @Override
+ public UserVIPLevel getVIPLevelByUid(Long uid) {
+ return userVIPLevelMapper.getLevelByUid(uid);
+ }
}
--
Gitblit v1.8.0