admin
2020-04-15 ee5c8055b1c0dd7c67a9025a76b10bd287c93d9a
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java
@@ -29,6 +29,7 @@
import com.yeshi.fanli.entity.bus.user.UserInviteSeparate;
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;
@@ -359,7 +360,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 +459,6 @@
            }
         }
         
         // 邀请成功时间
         Long succeedTime = threeSale.getSucceedTime(); 
         if (succeedTime == null) {
@@ -489,24 +489,30 @@
         array.add(loginJson);
         // 查询粉丝等级
         UserInviteLevelEnum level = null;
         UserLevelEnum level = null;
         UserInviteLevelEnum inviteLevel = 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.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(level == null) {
            if (userInfoExtra == null || StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {
               level = UserInviteLevelEnum.noActive;
            } else {
               level = UserInviteLevelEnum.actived;
            }
            level = UserLevelEnum.daRen;
         }
         if (inviteLevel == null) {
            inviteLevel = UserInviteLevelEnum.actived;
         }
         
         
@@ -518,7 +524,7 @@
         object.put("inviteTime", format.format(new Date(succeedTime)) + " 加入");
         object.put("state", state? 1 : 2);
         object.put("recentMsg", array);
         object.put("level", level.name());
         object.put("level", inviteLevel.name());
         object.put("validFans", validFans);
         
         
@@ -583,7 +589,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 +734,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", "系统已发送提醒,邀请人添加微信后你可复制,如对方迟迟不添加,你可联系人工客服寻求帮助");