From 1e1ae4f19489644c9ff35125d075a30f89536d16 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 21 五月 2020 17:35:36 +0800
Subject: [PATCH] 后台编辑
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java | 38 +++++++++++++++++---------------------
1 files changed, 17 insertions(+), 21 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 a136c1c..6844eb2 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
@@ -1299,7 +1299,14 @@
if (activeTime == null) {
activeTime = new Date(user.getCreatetime());
}
-
+
+ String inviteCode = "";
+ if (!StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode()))
+ inviteCode = userInfoExtra.getInviteCode();
+ if (!StringUtil.isNullOrEmpty(userInfoExtra.getInviteCodeVip()))
+ inviteCode = userInfoExtra.getInviteCodeVip();
+
+ data.put("inviteCode", inviteCode);
data.put("weixin", StringUtil.isNullOrEmpty(weixin) ? "" : weixin);
data.put("loginTime", TimeUtil.formatDate(activeTime));
@@ -1311,27 +1318,16 @@
data.put("taobao", false);
}
- UserVIPPreInfo userVIPPreInfo = userVIPPreInfoService.getLatestProcessInfo(fansId);
- if (userVIPPreInfo != null) {
- String levelName = null;
- Integer process = userVIPPreInfo.getProcess();
- if (process == UserVIPPreInfo.PROCESS_2) {
- levelName = "楂樼骇浼氬憳";
- } else if (process == UserVIPPreInfo.PROCESS_3) {
- levelName = "瓒呯骇浼氬憳";
- } else if (process == UserVIPPreInfo.PROCESS_4) {
- levelName = "璧勬繁瀵煎笀";
- }
-
- Integer sourceType = userVIPPreInfo.getSourceType();
- if (sourceType != null && levelName != null) {
- if (sourceType == UserVIPPreInfo.SOURCE_TYPE_ORDER) {
- data.put("level", levelName += "(鑷喘鍒嗕韩鍨�)");
- } else if (sourceType == UserVIPPreInfo.SOURCE_TYPE_TEAM) {
- data.put("level", levelName += "(閭�璇峰洟闃熷瀷)");
- }
- }
+ // 褰撳墠绛夌骇
+ UserLevelEnum level = null;
+ UserVIPLevel vipLevel = userInviteService.getVIPLevelByUid(fansId);
+ if (vipLevel != null && vipLevel.getLevel() != null) {
+ level = UserLevelUtil.getByLevel(vipLevel.getLevel());
}
+ if (level == null) {
+ level = UserLevelEnum.daRen;
+ }
+ data.put("level", UserLevelUtil.getShowLevel(level));
// 绮変笣缁熻
long indirectNum = 0;
--
Gitblit v1.8.0