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

admin

2020-07-01 055fb8d085efd7e120d69aba6c0fbb8db5867553

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

@@ -34,6 +34,7 @@
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleExtraInfoSerivce;

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

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

import com.yeshi.fanli.service.manger.msg.RocketMQManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

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

@@ -84,8 +85,8 @@
   @Resource(name = "taskExecutor")

   private TaskExecutor executor;



   @Resource(name = "producer")

   private Producer producer;

   @Resource

   private RocketMQManager rocketMQManager;



   public UserInfo getBoss(final long uid) {

      return threeSaleMapper.selectBoss(uid);

@@ -433,11 +434,15 @@
    */

   @Transactional

   private void inviteSuccess(Long workerId, Long bossId) {

      // 同步粉丝消息

      teamFansInfoService.addFansInfo(workerId, bossId, new Date());

		
      if (!Constant.IS_TEST) {

         UserInviteMQMsg msg = new UserInviteMQMsg(bossId, workerId, null, new Date(),

               UserInviteMQMsg.STATE_SUCCESS);

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

         producer.send(message);

         message.setStartDeliverTime(java.lang.System.currentTimeMillis() + 5000);

         rocketMQManager.sendNormalMsg(message,5000L, null);

      }



      executor.execute(new Runnable() {

@@ -445,13 +450,6 @@
         public void run() {

            try { // 邀请金币

               integralGetService.addInviteLevelOne(bossId, workerId);

            } catch (Exception e) {

               LogHelper.error(e);

            }

				
            // 同步粉丝消息

            try {

               teamFansInfoService.addFansInfo(workerId, bossId, new Date());

            } catch (Exception e) {

               LogHelper.error(e);

            }