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

yujian

2020-05-14 6cb04a3c75f46001a55be402c6650d5600748dc7

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteValidNumServiceImpl.java

@@ -10,8 +10,12 @@
import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



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

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

import com.yeshi.fanli.dao.mybatis.user.UserInviteValidNumMapper;

import com.yeshi.fanli.dao.mybatis.user.UserInviteValidRecordMapper;

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

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

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

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

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

@@ -23,6 +27,8 @@
import com.yeshi.fanli.service.inter.user.invite.UserInviteValidNumService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

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

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



@Service

public class UserInviteValidNumServiceImpl implements UserInviteValidNumService {

@@ -44,13 +50,13 @@
   @Resource

   private CommonOrderService commonOrderService;

   

	
   @Resource(name = "producer")

   private Producer producer;

   

   @Override

   public UserInviteValidNum selectByPrimaryKey(Long id) {

      return userInviteValidNumMapper.selectByPrimaryKey(id);

   }

	


   /**

    *  直接粉丝 +1

@@ -129,9 +135,6 @@
      userInviteValidRecordMapper.deleteByPrimaryKey(record.getId());

   }

   

	
	


   /**

    *  间接粉丝 +1

    * @param uid

@@ -197,6 +200,14 @@
            addNumFirst(bossId);

         }

         

         // 发送成为有效粉丝的消息

         if (!Constant.IS_TEST) {

            BeComeValidUserMQMsg msg = new BeComeValidUserMQMsg(uid, new Date());

            Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.becomeValidUser,

                  msg);

            producer.send(message);

         }



         // 是否上上级

         ThreeSale threeSaleSuper = threeSaleSerivce.getMyBoss(bossId);

         if (threeSaleSuper == null) {

@@ -222,7 +233,6 @@
         LogHelper.error(e);

      }

   }

	
   

   @Override

   public void syncInfoAgain(Long workerId) {

@@ -271,7 +281,8 @@
      if (inviteValid != null) {

         UserInviteValidNum updateObj = new UserInviteValidNum();

         updateObj.setId(uid);

         updateObj.setNumFirst(countTeam1);;

         updateObj.setNumFirst(countTeam1);

         ;

         userInviteValidNumMapper.updateByPrimaryKeySelective(updateObj);

      } else {

         inviteValid = new UserInviteValidNum();