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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -15,13 +15,16 @@
import com.yeshi.fanli.dto.mq.user.UserTopicTagEnum;

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

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

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

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

import com.yeshi.fanli.log.LogHelper;

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.VersionUtil;

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



/**

@@ -41,9 +44,13 @@


   @Resource

   private ThreeSaleSerivce threeSaleSerivce;

	


   @Resource

   private UserInviteValidNumService userInviteValidNumService;



   @Resource

   private UserActiveLogService userActiveLogService;

	


   @Override

   public Action consume(Message message, ConsumeContext context) {

@@ -57,12 +64,18 @@
      if (java.lang.System.currentTimeMillis() <= Constant.NEW_ORDER_FANLI_RULE_TIME) {

         return Action.CommitMessage;

      }

		


      // 邀请相关

      if (MQTopicName.TOPIC_USER.name().equalsIgnoreCase(message.getTopic())) {

         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());

@@ -72,19 +85,10 @@
               if (boss != null) {

                  teamUserLevelStatisticService.initData(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());

            if (boss != null) {

               teamUserLevelStatisticService.initData(boss.getId());

            }

            return Action.CommitMessage;

         }

         } 


      } else if (MQTopicName.TOPIC_ORDER.name().equalsIgnoreCase(message.getTopic())) {

         // 订单到账相关

@@ -92,20 +96,38 @@
            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());



               if (log == null || !VersionUtil.greaterThan_2_1(

                     "appstore".equalsIgnoreCase(log.getChannel()) ? "ios" : "android", log.getVersionCode())) {

                  return Action.CommitMessage;

               }



               if (dto.getType() == OrderMoneyRecievedMQMsg.TYPE_ZIGOU) {// 自购到账

                  // 会员升级-自购订单数量验证

                  userVIPPreInfoService.upgradeVipByFanLiOrder(dto.getUid());

                  userVIPPreInfoService.upgradeVipByMyOrder(dto.getUid());

               } else if (dto.getType() == OrderMoneyRecievedMQMsg.TYPE_SHARE) {// 分享到账

                  // 会员升级-分享订单数量验证

                  userVIPPreInfoService.upgradeVipByShareOrder(dto.getUid());

                  userVIPPreInfoService.upgradeVipByMyOrder(dto.getUid());

               }

            }

         } else if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderConfirm.name())) {

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

            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(), dto.getPlaceOrderTime());

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

                     dto.getPlaceOrderTime());

            }

         }

      }