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

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

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

@@ -1,7 +1,6 @@
package com.yeshi.fanli.service.impl.user.vip;



import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Collections;

import java.util.Comparator;

import java.util.Date;

@@ -15,17 +14,16 @@
import org.yeshi.utils.DateUtil;



import com.yeshi.fanli.dao.mybatis.user.vip.UserVIPPreInfoMapper;

import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail.MsgTypeOtherTypeEnum;

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

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

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

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

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.UserVIPPreInfo;

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

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

import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;

import com.yeshi.fanli.exception.user.vip.UserVIPPreInfoException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.ConfigService;

@@ -38,6 +36,7 @@
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;

import com.yeshi.fanli.service.inter.user.integral.IntegralDetailService;

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

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.UserVIPPreInfoService;

@@ -45,9 +44,6 @@
import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService;

import com.yeshi.fanli.vo.msg.ClientTextStyleVO;

import com.yeshi.fanli.vo.msg.CommonMsgItemVO;

import com.yeshi.fanli.vo.msg.CommonMsgItemVOFactory;



@Service

public class UserVIPPreInfoServiceImpl implements UserVIPPreInfoService {

@@ -95,6 +91,8 @@
   @Resource

   private UserInfoRegisterService userInfoRegisterService;

   

   @Resource

   private UserInviteMsgNotificationService userInviteMsgNotificationService;



   @Override

   public void addUserVIPPreInfo(UserVIPPreInfo info) throws UserVIPPreInfoException {

@@ -257,6 +255,7 @@
         limitSecond = Long.parseLong(second);

      }

      

      String item = "";

      Integer type = null;

      long targetNum1 = 0L;

      Long targetNum2 = 0L;

@@ -265,23 +264,27 @@
         process = true;

         type = Constant.TYPE_REBATE;

         targetNum1 = limitZiGou;

         item = "返利订单";

      } else if (countShare >= limitShare) {

         process = true;

         type = Constant.TYPE_SHAER;

         targetNum1 = limitShare;

         item = "分享订单";

      } else if (firstTeam >= limitFirst && secondTeam >= limitSecond) {

         process = true;

         targetNum1 = limitFirst;

         targetNum2 = limitSecond;

         item = "邀请粉丝";

      }



      if (process) {

         try {

            Date upgradeTime = new Date();

            UserVIPPreInfo info = new UserVIPPreInfo();

            info.setUid(uid);

            info.setProcess(UserVIPPreInfo.PROCESS_1);

            info.setCreateTime(new Date());

            info.setUpdateTime(new Date());

            info.setCreateTime(upgradeTime);

            info.setUpdateTime(upgradeTime);

            addUserVIPPreInfo(info);



            // 升级消息

@@ -303,7 +306,7 @@
               detail.setTitle("升级VIP福利");

               detail.setUid(uid);

               detail.setMoney(Integer.parseInt(goldcoin));

               detail.setCreateTime(new Date());

               detail.setCreateTime(upgradeTime);

               detail.setUniqueKey("VIP-3-" + uid);

               integralDetailService.insertSelective(detail);

               

@@ -311,21 +314,14 @@
               userInfoExtraService.addGoldCoinByUid(uid, Integer.parseInt(goldcoin));

               

               // 消息

               List<CommonMsgItemVO> listMsg = new ArrayList<>();

               listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("状        态", ClientTextStyleVO.COLOR_TITLE),

                     new ClientTextStyleVO("恭喜你！成功升级为普通会员", ClientTextStyleVO.COLOR_CONTENT)));

               listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("奖        励", ClientTextStyleVO.COLOR_TITLE),

                     new ClientTextStyleVO("获得金币" + goldcoinNum+"枚", ClientTextStyleVO.COLOR_CONTENT)));

               listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("备        注", ClientTextStyleVO.COLOR_TITLE),

                     new ClientTextStyleVO("详情查看，对应会员权益", ClientTextStyleVO.COLOR_CONTENT)));

               userOtherMsgNotificationService.createMsgOtherDetail(uid, listMsg, MsgTypeOtherTypeEnum.vipUpgradeReward);

               UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

               userOtherMsgNotificationService.goldCoinSystemGiveMsg(uid, goldcoinNum, userInfoExtra.getGoldCoin());

            }

				
            // 是否存在下级脱离期限 -更新不脱离

            userInviteSeparateService.updateInvalidByBossId(uid);

            

            // 上级脱离关系

            remindBoss(uid);

            // 提醒上级

            remindBoss(uid, "普通会员", item, upgradeTime, true);

            

         } catch (UserVIPPreInfoException e) {

            e.printStackTrace();

@@ -333,31 +329,6 @@
      }

      return process;

   }



	
   private void remindBoss(Long uid) {

      // 是否存在上级

      ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);

      if (threeSale == null)

         return;

		
      // 验证上级是否正常

      Long bossId = threeSale.getBoss().getId();

      UserInfo userInfo = userInfoService.getUserById(bossId);

      if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) {

         return;

      }

		
      // 验证上级是否已是会员

      UserVIPPreInfo oldInfo = userVIPPreInfoMapper.selectByUidAndProcess(bossId, UserVIPPreInfo.PROCESS_1);

      if (oldInfo != null) {

         return;

      }

		
      // 添加脱离关系倒计时

      userInviteSeparateService.addPreSeparateRecord(uid, bossId);

   }

	
   

   

   /**

@@ -398,33 +369,38 @@
      Integer type = null;

      long targetNum1 = 0L;

      Long targetNum2 = 0L;

      String item = "";

      boolean process = false;

      if (countZiGou >= limitZiGou) {

         process = true;

         targetNum1 = limitZiGou;

         type = Constant.TYPE_REBATE;

         item = "返利订单";

      } else if (countShare >= limitShare) {

         process = true;

         targetNum1 = limitShare;

         type = Constant.TYPE_SHAER;

         item = "分享订单";

      } else if (firstTeam >= limitFirst && secondTeam >= limitSecond) {

         process = true;

         targetNum1 = limitFirst;

         targetNum2 = limitSecond;

         item = "邀请粉丝";

      }



      if (process) {

         try {

            Date upgradeTime = new Date();

            UserVIPPreInfo info = new UserVIPPreInfo();

            info.setUid(uid);

            info.setProcess(UserVIPPreInfo.PROCESS_2);

            info.setCreateTime(new Date());

            info.setUpdateTime(new Date());

            info.setCreateTime(upgradeTime);

            info.setUpdateTime(upgradeTime);

            addUserVIPPreInfo(info);

            

            // 升级消息

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

            int daysBetween = DateUtil.daysBetween(pre1.getCreateTime(), new Date());

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

            userAccountMsgNotificationService.vipPreUpgrade(uid, "普通会员", "高级会员", daysBetween, targetNum1, targetNum2, type);

            

            // 赠送奖励券

@@ -432,20 +408,12 @@
            if (!StringUtil.isNullOrEmpty(rewardCoupon)) {

               int num = Integer.parseInt(rewardCoupon);

               BigDecimal percent = new BigDecimal(configService.get(ConfigKeyEnum.exchangeRebatePercent.getKey()));

               for (int i = 0; i < num; i++) {

                  userSystemCouponService.insertUserCoupon(uid, CouponTypeEnum.rebatePercentCoupon.name(),

                        UserSystemCoupon.SOURCE_SYSTEM_PUSH, percent, false);

               }

					
               List<CommonMsgItemVO> listMsg = new ArrayList<>();

               listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("状        态", ClientTextStyleVO.COLOR_TITLE),

                     new ClientTextStyleVO("恭喜你！成功升级为高级会员", ClientTextStyleVO.COLOR_CONTENT)));

               listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("奖        励", ClientTextStyleVO.COLOR_TITLE),

                     new ClientTextStyleVO("获得返利奖励券" + num +"张", ClientTextStyleVO.COLOR_CONTENT)));

               listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("备        注", ClientTextStyleVO.COLOR_TITLE),

                     new ClientTextStyleVO("详情查看，对应会员权益", ClientTextStyleVO.COLOR_CONTENT)));

               userOtherMsgNotificationService.createMsgOtherDetail(uid, listMsg, MsgTypeOtherTypeEnum.vipUpgradeReward);

               userSystemCouponService.rewardCouponWin(uid, UserSystemCoupon.SOURCE_SYSTEM_PUSH, num, true, percent);

            }

				
            // 提醒上级

            remindBoss(uid, "高级会员", item, upgradeTime, false);

				
         } catch (Exception e) {

            e.printStackTrace();

            LogHelper.error(e);

@@ -453,8 +421,52 @@
      }

      return process;

   }

	


   @Override

   public void remindBoss(Long uid, String rankName, String item, Date time, boolean divorced) {

      // 是否存在上级

      ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);

      if (threeSale == null)

         return;

      Long bossId = threeSale.getBoss().getId();

      UserInfo userInfo = userInfoService.selectByPKey(uid);

		
      // 粉丝升级提醒

      userInviteMsgNotificationService.fansUpgrade(bossId, "直接粉丝", rankName, userInfo.getNickName(), item, time);

		
      // 是否存在上上级

      ThreeSale threeSaleSuper = threeSaleSerivce.getMyBoss(bossId);

      if (threeSaleSuper != null) { // 粉丝升级提醒

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

         userInviteMsgNotificationService.fansUpgrade(bossIdSuper, "间接粉丝", rankName, userInfo.getNickName(), item, time);

      }

		
      // 是否升级脱离

      if (!divorced) {

         return;

      }

		
      // 验证上级是否已是会员

      UserVIPPreInfo oldInfo = userVIPPreInfoMapper.selectByUidAndProcess(bossId, UserVIPPreInfo.PROCESS_1);

      if (oldInfo == null) {

         // 添加脱离关系倒计时

         userInviteSeparateService.addPreSeparateRecord(uid, bossId);

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

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

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

         if (threeSaleSuper != null) { 
            UserInfo boss = userInfoService.selectByPKey(bossId);

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

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

                  boss.getNickName(), item, time);

         } 
      }

   }

	
   @Override

   public UserVIPPreInfo selectByUidAndProcess(Long uid, int process) {

      UserVIPPreInfo info = userVIPPreInfoMapper.selectByUidAndProcess(uid, process);

      return info;