Merge remote-tracking branch 'origin/div' into div

admin

2020-04-15 d4588f4e43336b26b356b869c29d0c76390167d5

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java

@@ -21,6 +21,8 @@
import com.yeshi.fanli.entity.bus.user.UserInfoRegister;

import com.yeshi.fanli.entity.bus.user.UserInviteValidNum;

import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;

import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;

import com.yeshi.fanli.entity.bus.user.vip.UserLevelUpgradedNotify;

import com.yeshi.fanli.entity.bus.user.vip.UserVIPPreInfo;

import com.yeshi.fanli.entity.integral.IntegralDetail;

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

@@ -39,6 +41,7 @@
import com.yeshi.fanli.service.inter.user.invite.UserInviteMsgNotificationService;

import com.yeshi.fanli.service.inter.user.invite.UserInviteValidNumService;

import com.yeshi.fanli.service.inter.user.msg.UserAccountMsgNotificationService;

import com.yeshi.fanli.service.inter.user.vip.UserLevelUpgradedNotifyService;

import com.yeshi.fanli.service.inter.user.vip.UserVIPPreInfoService;

import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;

import com.yeshi.fanli.util.Constant;

@@ -93,6 +96,9 @@
   

   @Resource

   private UserInviteMsgNotificationService userInviteMsgNotificationService;

	
   @Resource

   private UserLevelUpgradedNotifyService userLevelUpgradedNotifyService;



   @Override

   public void addUserVIPPreInfo(UserVIPPreInfo info) throws UserVIPPreInfoException {

@@ -296,6 +302,16 @@
            int daysBetween = DateUtil.daysBetween(registerTime, new Date());

            userAccountMsgNotificationService.vipPreUpgrade(uid, "快省达人", "普通会员", daysBetween, targetNum1, targetNum2, type);

            

				
            // 升级弹框提示

            UserLevelUpgradedNotify notify = new UserLevelUpgradedNotify();

            notify.setUid(uid);

            notify.setFromLevel(UserLevelEnum.daRen);

            notify.setToLevel(UserLevelEnum.normalVIP);

            notify.setValid(true);

            notify.setCreateTime(new Date());

            userLevelUpgradedNotifyService.addUserLevelUpgradedNotify(notify);

				
            // 赠送金币

            String goldcoin = userVipConfigService.getValueByKey("vip_pre_3_gift_goldcoin");

            if (!StringUtil.isNullOrEmpty(goldcoin)) {

@@ -398,6 +414,15 @@
            info.setUpdateTime(upgradeTime);

            addUserVIPPreInfo(info);

            

            // 升级弹框提示

            UserLevelUpgradedNotify notify = new UserLevelUpgradedNotify();

            notify.setUid(uid);

            notify.setFromLevel(UserLevelEnum.normalVIP);

            notify.setToLevel(UserLevelEnum.highVIP);

            notify.setValid(true);

            notify.setCreateTime(new Date());

            userLevelUpgradedNotifyService.addUserLevelUpgradedNotify(notify);

				
            // 升级消息

            UserVIPPreInfo pre1 = userVIPPreInfoMapper.selectByUidAndProcess(uid, UserVIPPreInfo.PROCESS_1);

            int daysBetween = DateUtil.daysBetween(pre1.getCreateTime(), upgradeTime);

@@ -454,14 +479,14 @@
         userInviteSeparateService.addPreSeparateRecord(uid, bossId);

         

         // 直接粉丝脱离-开始脱离提醒

         userInviteMsgNotificationService.fansPreDivorced(bossId, rankName, userInfo.getNickName(), item, time);

         userInviteMsgNotificationService.fansPreDivorced(bossId, rankName, userInfo.getNickName(), time);

         

         //间接粉丝脱离-开始脱离提醒

         if (threeSaleSuper != null) { 

            UserInfo boss = userInfoService.selectByPKey(bossId);

            Long bossIdSuper = threeSaleSuper.getBoss().getId();

            userInviteMsgNotificationService.fansPredivorcedIndirect(bossIdSuper, rankName, userInfo.getNickName(),

                  boss.getNickName(), item, time);

                  boss.getNickName(), time);

         } 

      }

   }