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

yujian

2020-05-11 712fb305d6f79961e879a2f543107e19d7f9e8a2

 fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/user/UserVIPMessageListener.java

@@ -21,6 +21,7 @@
import com.yeshi.fanli.service.inter.user.UserActiveLogService;

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

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

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

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

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

import com.yeshi.fanli.util.Constant;

@@ -50,6 +51,10 @@


   @Resource

   private UserActiveLogService userActiveLogService;

	
   @Resource

   private TeamLevelDailyRecordService teamLevelDailyRecordService;

	


   @Override

   public Action consume(Message message, ConsumeContext context) {

@@ -69,6 +74,12 @@
         if (tag.equalsIgnoreCase(UserTopicTagEnum.userLevelChanged.name())) {// 用户等级发生变化

            UserLevelChangedMQMsg msg = new Gson().fromJson(new String(message.getBody()),

                  UserLevelChangedMQMsg.class);



            for (Long fuid : Constant.NO_UPGRADE_UIDS) {// 禁止不能升级的用户升级

               if (msg.getUid().longValue() == fuid)

                  return Action.CommitMessage;

            }



            // 更新上2级的邀请统计

            teamUserLevelStatisticService.updateUserLevel(msg.getUid());

            UserInfo boss = threeSaleSerivce.getBoss(msg.getUid());

@@ -78,11 +89,15 @@
               if (boss != null) {

                  teamUserLevelStatisticService.initData(boss.getId());

               }

					
               // 重新统计粉丝等级数量

               teamLevelDailyRecordService.addStatisticByUid(boss.getId());

            }

            return Action.CommitMessage;

         } else if (tag.equalsIgnoreCase(UserTopicTagEnum.threeSaleSeparate.name())) {// 邀请关系脱离

            ThreeSaleSeparateMQMsg msg = new Gson().fromJson(new String(message.getBody()),

                  ThreeSaleSeparateMQMsg.class);



            // 更新上两级邀请统计

            teamUserLevelStatisticService.initData(msg.getBossUid());

            UserInfo boss = threeSaleSerivce.getBoss(msg.getBossUid());

@@ -98,6 +113,10 @@
            OrderMoneyRecievedMQMsg dto = new Gson().fromJson(new String(message.getBody()),

                  OrderMoneyRecievedMQMsg.class);

            if (dto != null) {

               for (Long fuid : Constant.NO_UPGRADE_UIDS) {// 禁止不能升级的用户升级

                  if (dto.getUid().longValue() == fuid)

                     return Action.CommitMessage;

               }

               // 判断版本

               UserActiveLog log = userActiveLogService.getUserLatestActiveInfo(dto.getUid());



@@ -117,6 +136,11 @@
         } else if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderConfirm.name())) {

            OrderConfirmMQMsg dto = new Gson().fromJson(new String(message.getBody()), OrderConfirmMQMsg.class);

            if (dto != null) {

               for (Long fuid : Constant.NO_UPGRADE_UIDS) {// 禁止不能升级的用户升级

                  if (dto.getSourceUid().longValue() == fuid)

                     return Action.CommitMessage;

               }



               // 会员等级升级-粉丝数量验证

               userVIPPreInfoService.upgradeVipByTeamNum(dto.getSourceUid());

               userInviteValidNumService.addValidTeamNum(dto.getSourceUid(), dto.getSettleMent(),