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)); } fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
@@ -605,7 +605,7 @@ if (!StringUtil.isNullOrEmpty(second)) { limitSecond = Long.parseLong(second); } } else if (level == UserInviteLevelEnum.vipPre1) { } else if (level == UserInviteLevelEnum.normalVIP) { String zigou = userVipConfigService.getValueByKey("vip_pre_7_zigou_order_count"); if (!StringUtil.isNullOrEmpty(zigou)) { limitZiGou = Long.parseLong(zigou); @@ -622,7 +622,7 @@ if (!StringUtil.isNullOrEmpty(second)) { limitSecond = Long.parseLong(second); } } else if (level == UserInviteLevelEnum.vipPre2 || level == UserInviteLevelEnum.vipApply) { } else if (level == UserInviteLevelEnum.highVIP || level == UserInviteLevelEnum.vipApply) { String zigou = userVipConfigService.getValueByKey("vip_pre_10_zigou_order_count"); if (!StringUtil.isNullOrEmpty(zigou)) { limitZiGou = Long.parseLong(zigou); fanli/src/main/java/com/yeshi/fanli/dto/user/UserInviteLevelEnum.java
@@ -1,18 +1,21 @@ package com.yeshi.fanli.dto.user; public enum UserInviteLevelEnum { noActive("未激活", ""), actived("已经激活", ""), vipApply("超级会员申请中", ""), vipPre1("普通会员", ""), vipPre2("高级会员", ""), vip("超级会员", ""), tearcherApply("导师申请中",""), tearcher("导师", ""); noActive(0,"未激活", ""), actived(0, "已经激活", ""), normalVIP(3,"普通会员", ""), highVIP(7,"高级会员", ""), vipApply(7,"超级会员申请中", ""), vip(10, "超级会员", ""), tearcherApply(10,"导师申请中",""), tearcher(11,"导师", ""); private int level; private String name; private String link; private UserInviteLevelEnum(String name, String link) { private UserInviteLevelEnum(int level, String name, String link) { this.level = level; this.name = name; this.link = link; } @@ -24,4 +27,9 @@ public String getLink() { return this.link; } public int getLevel() { return level; } } fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteServiceImpl.java
@@ -7,6 +7,7 @@ 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.UserLevelEnum; 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; @@ -62,9 +63,9 @@ UserVIPPreInfo userVIPPreInfo = userVIPPreInfoService.getLatestProcessInfo(uid); if (userVIPPreInfo != null) { if (userVIPPreInfo.getProcess() == UserVIPPreInfo.PROCESS_1) { return UserInviteLevelEnum.vipPre1; return UserInviteLevelEnum.normalVIP; } else if (userVIPPreInfo.getProcess() == UserVIPPreInfo.PROCESS_2) { return UserInviteLevelEnum.vipPre2; return UserInviteLevelEnum.highVIP; } } } else if (info.getState() == UserVIPInfo.STATE_VERIFING) { @@ -105,4 +106,6 @@ public UserVIPLevel getVIPLevelByUid(Long uid) { return userVIPLevelMapper.getLevelByUid(uid); } } fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java
@@ -523,9 +523,8 @@ return; } // 验证上级是否已是会员 UserVIPPreInfo oldInfo = userVIPPreInfoMapper.selectByUidAndProcess(bossId, UserVIPPreInfo.PROCESS_1); if (oldInfo == null) { UserVIPPreInfo latestInfo = getLatestProcessInfo(bossId); if (latestInfo == null) { // 添加脱离关系倒计时 userInviteSeparateService.addPreSeparateRecord(uid, bossId);
@@ -28,6 +28,22 @@ } /** * 根据等级数字 * @param level * @return */ public static UserLevelEnum getByLevel(Integer level) { if (level == null) return null; for (UserLevelEnum levelEnum : UserLevelEnum.values()) { if (levelEnum.getLevel() == level) return levelEnum; } return null; } /** * 根据订单rank获取用户的等级 * @Title: getByOrderRank * @Description:
