配置文件修改

admin

2019-11-23 51a4ff5d777028d52a19c314a99f796334cb7b51

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

@@ -22,6 +22,7 @@
import com.yeshi.fanli.dto.mq.user.body.UserInviteMQMsg;

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

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

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

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

import com.yeshi.fanli.exception.user.ThreeSaleException;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

@@ -35,6 +36,8 @@
import com.yeshi.fanli.service.inter.user.invite.UserInviteMsgNotificationService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.VersionUtil;

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

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



import net.sf.json.JSONArray;

@@ -600,7 +603,14 @@
   @Transactional

   private void inviteSuccess(Long bossId, Long workerId, ThreeSale threeSale) {

      // 邀请消息

      userInviteMsgNotificationService.inviteSuccess(threeSale.getBoss().getId(), threeSale);

      UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(bossId);

      if (activeLog != null && VersionUtil.greaterThan_2_1("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",

            activeLog.getVersionCode())) { // 2.1版本以上

         userInviteMsgNotificationService.inviteSuccess2_1(bossId, threeSale);

      } else { // 最初消息

         userInviteMsgNotificationService.inviteSuccess(threeSale.getBoss().getId(), threeSale);

      }

		
      executor.execute(new Runnable() {

         @Override

         public void run() {

@@ -609,8 +619,8 @@
         }

      });

      UserInviteMQMsg msg = new UserInviteMQMsg(bossId, workerId, null, new Date(), UserInviteMQMsg.STATE_SUCCESS);

      Message message = new Message(MQTopicName.TOPIC_USER.name(), UserTopicTagEnum.inviteSuccess.name(),

            new Gson().toJson(msg).getBytes());

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

            msg);

      producer.send(message);

   }



@@ -652,8 +662,11 @@


   @Override

   public ThreeSale selectLatestByWorkerIdAndState(Long workerId, int state) {



      return threeSaleMapper.selectLatestByWorkerIdAndState(workerId, state);

   }



   @Override

   public ThreeSale getByWorkerIdAndTime(Long workerId, long time) {

      return threeSaleMapper.getByWorkerIdAndTime(workerId, time);

   }

}