From 0b57cfd62e842b309d03467b96a331c673ecad7c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 21 四月 2020 14:08:18 +0800
Subject: [PATCH] 删除普通会员等级
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java | 42 +++++++++++++++++++++---------------------
1 files changed, 21 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 e44029a..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,8 +26,10 @@
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;
import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.system.SystemClientParams;
@@ -47,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;
@@ -56,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;
@@ -110,6 +113,8 @@
@Resource
private UserInviteValidRecordService userInviteValidRecordService;
+ @Resource
+ private UserInviteValidNumService userInviteValidNumService;
/**
@@ -359,7 +364,7 @@
} else {
if (!threeSaleExtraInfoSerivce.isRemindWorker(uid, workerId)) {
object.put("weiXinState", 1);
- object.put("weiXinTip", "鐐瑰嚮鎻愰啋TA锛岀郴缁熶細鍙戦�佷竴灏佺珯鍐呬俊锛屾彁閱掑叾娣诲姞寰俊鍙枫��");
+ object.put("weiXinTip", "鐐瑰嚮鎻愰啋锛岀郴缁熶細鍙戦�佷竴灏佺珯鍐呬俊锛屾彁閱掑叾娣诲姞寰俊鍙枫��");
} else {
object.put("weiXinState", 2);
object.put("weiXinTip", "绯荤粺宸插彂閫佹彁閱掞紝閭�璇蜂汉娣诲姞寰俊鍚庝綘鍙鍒讹紝濡傚鏂硅繜杩熶笉娣诲姞锛屼綘鍙仈绯讳汉宸ュ鏈嶅姹傚府鍔�");
@@ -458,7 +463,6 @@
}
}
-
// 閭�璇锋垚鍔熸椂闂�
Long succeedTime = threeSale.getSucceedTime();
if (succeedTime == null) {
@@ -489,24 +493,13 @@
array.add(loginJson);
// 鏌ヨ绮変笣绛夌骇
- UserInviteLevelEnum level = null;
+ UserLevelEnum level = 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.getLevel() != null) {
+ level = UserLevelUtil.getByLevel(vipLevel.getLevel());
}
-
if(level == null) {
- if (userInfoExtra == null || StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {
- level = UserInviteLevelEnum.noActive;
- } else {
- level = UserInviteLevelEnum.actived;
- }
+ level = UserLevelEnum.daRen;
}
@@ -583,7 +576,7 @@
} else {
if (!threeSaleExtraInfoSerivce.isRemindWorker(uid, workerId)) {
object.put("weiXinState", 1);
- object.put("weiXinTip", "鐐瑰嚮鎻愰啋TA锛岀郴缁熶細鍙戦�佷竴灏佺珯鍐呬俊锛屾彁閱掑叾娣诲姞寰俊鍙枫��");
+ object.put("weiXinTip", "鐐瑰嚮鎻愰啋锛岀郴缁熶細鍙戦�佷竴灏佺珯鍐呬俊锛屾彁閱掑叾娣诲姞寰俊鍙枫��");
} else {
object.put("weiXinState", 2);
object.put("weiXinTip", "绯荤粺宸插彂閫佹彁閱掞紝閭�璇蜂汉娣诲姞寰俊鍚庝綘鍙鍒讹紝濡傚鏂硅繜杩熶笉娣诲姞锛屼綘鍙仈绯讳汉宸ュ鏈嶅姹傚府鍔�");
@@ -728,7 +721,7 @@
} else {
if (!threeSaleExtraInfoSerivce.isRemindBoss(boss.getId(), uid)) {
bossData.put("weiXinState", 1);
- bossData.put("weiXinTip", "鐐瑰嚮鎻愰啋TA锛岀郴缁熶細鍙戦�佷竴灏佺珯鍐呬俊锛屾彁閱掑叾娣诲姞寰俊鍙枫��");
+ bossData.put("weiXinTip", "鐐瑰嚮鎻愰啋锛岀郴缁熶細鍙戦�佷竴灏佺珯鍐呬俊锛屾彁閱掑叾娣诲姞寰俊鍙枫��");
} else {
bossData.put("weiXinState", 2);
bossData.put("weiXinTip", "绯荤粺宸插彂閫佹彁閱掞紝閭�璇蜂汉娣诲姞寰俊鍚庝綘鍙鍒讹紝濡傚鏂硅繜杩熶笉娣诲姞锛屼綘鍙仈绯讳汉宸ュ鏈嶅姹傚府鍔�");
@@ -902,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