From d0c6d869cbe9fc388fee13448d31a69138796442 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 15 四月 2020 18:11:32 +0800
Subject: [PATCH] 邀请等级
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java | 38 ++++++++++++++++----------------------
1 files changed, 16 insertions(+), 22 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 fddba37..f93cd6f 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
@@ -16,7 +16,6 @@
import org.yeshi.utils.DateUtil;
import org.yeshi.utils.JsonUtil;
-import com.yeshi.fanli.dto.user.UserInviteLevelEnum;
import com.yeshi.fanli.dto.vip.UserVIPLevel;
import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;
import com.yeshi.fanli.entity.accept.AcceptData;
@@ -27,6 +26,7 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.user.UserInviteSeparate;
+import com.yeshi.fanli.entity.bus.user.UserInviteValidNum;
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;
@@ -48,6 +48,7 @@
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleExtraInfoSerivce;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.invite.UserInviteService;
+import com.yeshi.fanli.service.inter.user.invite.UserInviteValidNumService;
import com.yeshi.fanli.service.inter.user.invite.UserInviteValidRecordService;
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
import com.yeshi.fanli.util.Constant;
@@ -57,6 +58,7 @@
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
+import com.yeshi.fanli.util.user.UserLevelUtil;
import com.yeshi.fanli.util.wx.WXLoginUtil;
import net.sf.json.JSONArray;
@@ -111,6 +113,8 @@
@Resource
private UserInviteValidRecordService userInviteValidRecordService;
+ @Resource
+ private UserInviteValidNumService userInviteValidNumService;
/**
@@ -490,29 +494,12 @@
// 鏌ヨ绮変笣绛夌骇
UserLevelEnum level = null;
- UserInviteLevelEnum inviteLevel = null;
UserVIPLevel vipLevel = userInviteService.getVIPLevelByUid(workerId);
- 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 (vipLevel != null && vipLevel.getLevel() != null) {
+ level = UserLevelUtil.getByLevel(vipLevel.getLevel());
}
-
if(level == null) {
level = UserLevelEnum.daRen;
- }
-
- if (inviteLevel == null) {
- inviteLevel = UserInviteLevelEnum.actived;
}
@@ -524,7 +511,7 @@
object.put("inviteTime", format.format(new Date(succeedTime)) + " 鍔犲叆");
object.put("state", state? 1 : 2);
object.put("recentMsg", array);
- object.put("level", inviteLevel.name());
+ object.put("level", level.name());
object.put("validFans", validFans);
@@ -908,8 +895,15 @@
return;
}
+ // 鏈夋晥绮変笣
+ int doneFirst = 0;
+ UserInviteValidNum userInviteValidNum = userInviteValidNumService.selectByPrimaryKey(uid);
+ if (userInviteValidNum != null) {
+ doneFirst = userInviteValidNum.getNumFirst() == null ? 0 : userInviteValidNum.getNumFirst();
+ }
+
JSONObject data = new JSONObject();
- data.put("num", threeSaleSerivce.countFirstTeam(uid, 1));
+ data.put("num", doneFirst);
data.put("limit", Constant.INVITE_CODRE_TAILOR_LIMIT);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0