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/UserTeamMessageListener.java

@@ -20,9 +20,12 @@
import com.yeshi.fanli.dto.mq.user.body.UserLevelChangedMQMsg;

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

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

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

import com.yeshi.fanli.log.LogHelper;

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

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

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

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

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



import net.sf.json.JSONObject;

@@ -41,6 +44,12 @@


   @Resource

   private ThreeSaleDetailService threeSaleDetailService;



   @Resource

   private ThreeSaleSerivce threeSaleSerivce;



   @Resource

   private TeamUserLevelStatisticService teamUserLevelStatisticService;



   @Override

   public Action consume(Message message, ConsumeContext context) {

@@ -90,9 +99,18 @@
               // 更新上级的粉丝数量

               teamFansInfoService.updateFansNum(mqMsg.getBossId());

               // 添加粉丝信息

               teamFansInfoService.addFansInfo(mqMsg.getWorkerId(), mqMsg.getBossId());



               teamFansInfoService.addFansInfo(mqMsg.getWorkerId(), mqMsg.getBossId(), mqMsg.getSuccessTime());



               threeSaleDetailService.addByWorkerUid(mqMsg.getWorkerId());



               // 更新队员统计信息

               teamUserLevelStatisticService.initData(mqMsg.getBossId());

               UserInfo boss = threeSaleSerivce.getBoss(mqMsg.getBossId());

               if (boss != null) {

                  teamUserLevelStatisticService.initData(boss.getId());

               }



            }

         } else if (tag.equalsIgnoreCase(UserTopicTagEnum.userMoneyAdd.name())) {// 资金到账

            JSONObject json = JSONObject.fromObject(new String(message.getBody()));