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

yujian

2020-04-23 2bd2200f209ddb7bcc59b636d9de6f8b3f762958

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

@@ -10,34 +10,35 @@
import org.springframework.context.annotation.Lazy;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import org.yeshi.utils.DateUtil;



import com.aliyun.openservices.ons.api.Message;

import com.aliyun.openservices.ons.api.Producer;

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

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

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

import com.yeshi.fanli.dto.mq.user.UserTopicTagEnum;

import com.yeshi.fanli.dto.mq.user.body.UserLevelChangedMQMsg;

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

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;

import com.yeshi.fanli.service.inter.msg.UserOtherMsgNotificationService;

import com.yeshi.fanli.service.inter.shop.BanLiShopOrderService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.UserInviteSeparateService;

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

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.rocketmq.MQMsgBodyFactory;

import com.yeshi.fanli.util.rocketmq.MQTopicName;



@Service

public class UserVIPInfoServiceImpl implements UserVIPInfoService {

@@ -49,36 +50,16 @@
   private UserInfoService userInfoService;



   @Resource

   private UserInfoExtraService userInfoExtraService;



   @Resource

   private UserVipConfigService userVipConfigService;



   @Lazy

   @Resource

   private HongBaoV2CountService hongBaoV2CountService;



   @Resource

   private IntegralDetailService integralDetailService;



   @Resource

   private BanLiShopOrderService banLiShopOrderService;



   @Resource

   private UserOtherMsgNotificationService userOtherMsgNotificationService;



   @Resource

   private ThreeSaleSerivce threeSaleSerivce;



   @Resource

   private UserInviteSeparateService userInviteSeparateService;



   @Resource

   private ConfigService configService;



   @Lazy

   @Resource

   private UserSystemCouponService userSystemCouponService;



   @Resource

   private UserVIPPreInfoService userVIPPreInfoService;

@@ -88,6 +69,17 @@
   

   @Resource

   private UserInviteValidNumService userInviteValidNumService;

	
   @Resource

   private UserLevelUpgradedNotifyService userLevelUpgradedNotifyService;

	
   @Resource

   private UserInviteMsgNotificationService userInviteMsgNotificationService;

	
   @Resource(name = "producer")

   private Producer producer;

	
	


   @Override

   @Transactional(rollbackFor = Exception.class)

@@ -206,12 +198,7 @@


      if (!verifyVip(uid))

         throw new UserVIPInfoException(1, "系统验证：不满足升级条件");



      // 额外信息

      UserInfoExtra userInfoExtra = userInfoExtraService.getByUidForUpdate(uid);

      if (userInfoExtra == null)

         throw new UserVIPInfoException(1, "用户信息不存在");



	
      Date upgradeTime = new Date();

      // 通过超级会员

      UserVIPInfo info = new UserVIPInfo();

@@ -221,28 +208,36 @@
      info.setUpdateTime(upgradeTime);

      userVIPInfoMapper.updateByPrimaryKeySelective(info);



      try {

         // 赠送免单券

         String giveCoupon = userVipConfigService.getValueByKey("vip_pre_10_gift_givefree_coupon");

         if (!StringUtil.isNullOrEmpty(giveCoupon)) {

            int num = Integer.parseInt(giveCoupon);

            userSystemCouponService.freeCouponWin(uid, CouponTypeEnum.freeCouponGive,

                  UserSystemCoupon.SOURCE_SYSTEM_PUSH, num, true);

         }

      } catch (Exception e) {

         throw new UserVIPInfoException(1, "券赠送失败");

      }

      // 升级弹框提示

      UserLevelUpgradedNotify notify = new UserLevelUpgradedNotify();

      notify.setUid(uid);

      notify.setFromLevel(UserLevelEnum.highVIP);

      notify.setToLevel(UserLevelEnum.superVIP);

      notify.setValid(true);

      notify.setCreateTime(new Date());

      userLevelUpgradedNotifyService.addUserLevelUpgradedNotify(notify);

      

      try {

         // 升级消息

         UserVIPPreInfo pre1 = userVIPPreInfoService.getVipByProcess(uid, UserVIPPreInfo.PROCESS_2);

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

         userAccountMsgNotificationService.vipUpgradeSuccess(uid, days);

         userAccountMsgNotificationService.vipUpgradeSuccess(uid, TimeUtil.getDayDifferenceCount(pre1.getCreateTime(), new Date()));

         

         // 升级提醒上级

         userVIPPreInfoService.remindBoss(uid, "超级会员", getPassItem(uid), upgradeTime, false);

         // 直接粉丝升级提醒

         ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);

         if (threeSale != null) {

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

            UserInfo userInfo = userInfoService.selectByPKey(uid);

            userInviteMsgNotificationService.fansUpgrade(bossId,  "超级会员", userInfo.getNickName(), getPassItem(uid), upgradeTime);

         }

      } catch (Exception e) {

         e.printStackTrace();

      }

		


      if (!Constant.IS_TEST) {

         UserLevelChangedMQMsg msg = new UserLevelChangedMQMsg(uid, UserLevelEnum.highVIP,UserLevelEnum.superVIP, new Date());

         Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.userLevelChanged, msg);

         producer.send(message);

      }

   }



@@ -253,13 +248,8 @@
    * @return

    */

   private String getPassItem(Long uid) {

      // 自购订单

      long doneZiGou = hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY,

            HongBaoV2.TYPE_ZIGOU);

      // 分享订单

      long doneShare = hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY,

            HongBaoV2.TYPE_SHARE_GOODS);

		
      // 自购 + 分享订单

      long doneOrder = hongBaoV2CountService.countMyDirectOrderByCashArrival(uid, Constant.VIP_ORDER_PAY);

      // 有效粉丝

      int doneFirst = 0;

      int doneSecond = 0;

@@ -269,16 +259,10 @@
         doneSecond = userInviteValidNum.getNumSecond() == null ? 0 : userInviteValidNum.getNumSecond();

      }



      long limitZiGou = 0;

      String zigou = userVipConfigService.getValueByKey("vip_pre_10_zigou_order_count");

      long limitOrder = 0;

      String zigou = userVipConfigService.getValueByKey("vip_pre_10_order_count");

      if (!StringUtil.isNullOrEmpty(zigou)) {

         limitZiGou = Long.parseLong(zigou);

      }

		
      long limitShare = 0;

      String share = userVipConfigService.getValueByKey("vip_pre_10_share_order_count");

      if (!StringUtil.isNullOrEmpty(share)) {

         limitShare = Long.parseLong(share);

         limitOrder = Long.parseLong(zigou);

      }

      

      long limitFirst = 0;

@@ -294,12 +278,10 @@
      }

      

      String item = "";

      if (doneZiGou >= limitZiGou) {

         item = "返利订单";

      } else if (doneShare >= limitShare) {

         item = "分享订单";

      if (doneOrder >= limitOrder) {

         item = "返利+分享订单";

      } else if (doneFirst >= limitFirst && doneSecond >= limitSecond) {

         item = "邀请粉丝";

         item = "直接+间接粉丝";

      }

      return item;

   }

@@ -311,13 +293,8 @@
    * @return

    */

   private boolean verifyVip(Long uid) {

      // 自购订单

      long doneZiGou = hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY,

            HongBaoV2.TYPE_ZIGOU);

      // 分享订单

      long doneShare = hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY,

            HongBaoV2.TYPE_SHARE_GOODS);

		
      // 自购 + 分享订单

      long doneOrder = hongBaoV2CountService.countMyDirectOrderByCashArrival(uid, Constant.VIP_ORDER_PAY);

      // 有效粉丝

      int doneFirst = 0;

      int doneSecond = 0;

@@ -326,17 +303,10 @@
         doneFirst = userInviteValidNum.getNumFirst() == null ? 0 : userInviteValidNum.getNumFirst();

         doneSecond = userInviteValidNum.getNumSecond() == null ? 0 : userInviteValidNum.getNumSecond();

      }



      long limitZiGou = 0;

      String zigou = userVipConfigService.getValueByKey("vip_pre_10_zigou_order_count");

      long limitOrder = 0;

      String zigou = userVipConfigService.getValueByKey("vip_pre_10_order_count");

      if (!StringUtil.isNullOrEmpty(zigou)) {

         limitZiGou = Long.parseLong(zigou);

      }

		
      long limitShare = 0;

      String share = userVipConfigService.getValueByKey("vip_pre_10_share_order_count");

      if (!StringUtil.isNullOrEmpty(share)) {

         limitShare = Long.parseLong(share);

         limitOrder = Long.parseLong(zigou);

      }

      

      long limitFirst = 0;

@@ -351,7 +321,7 @@
         limitSecond = Long.parseLong(second);

      }

      

      if (doneZiGou >= limitZiGou || doneShare >= limitShare || (doneFirst >= limitFirst && doneSecond >= limitSecond)) {

      if (doneOrder >= limitOrder  || (doneFirst >= limitFirst && doneSecond >= limitSecond)) {

         return true;

      }

      return false;

@@ -373,7 +343,6 @@
      info.setState(UserVIPInfo.STATE_INVALID);

      info.setUpdateTime(new Date());

      userVIPInfoMapper.updateByPrimaryKeySelective(info);



      // 消息

      userAccountMsgNotificationService.vipUpgradeFail(uid, reason);

   }