邀请成功新版消息

yujian

2019-11-14 7bedd903b10c125660d25373ffea23201bed22cc

 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,7 @@
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.MQTopicName;



import net.sf.json.JSONArray;

@@ -600,7 +602,18 @@
   @Transactional

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

      // 邀请消息

      UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(bossId);

      if (activeLog != null) {

         if (VersionUtil.greaterThan_2_0_2("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",

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

            userInviteMsgNotificationService.inviteSuccess2_0_2(bossId, threeSale);

         } else { // 最初消息

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

         }

      } else { // 最初消息

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

      }

		
      executor.execute(new Runnable() {

         @Override

         public void run() {

@@ -652,8 +665,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);

   }

}