免单更改

admin

2019-08-22 c044b6dd024b6884a4f39bc56e4873c95b13fe02

 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java

@@ -8,7 +8,6 @@


import javax.annotation.Resource;



import org.apache.ibatis.annotations.Param;

import org.springframework.core.task.TaskExecutor;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

@@ -22,11 +21,13 @@
import com.yeshi.fanli.exception.ThreeSaleException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleExtraInfoSerivce;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.msg.MsgInviteDetailService;

import com.yeshi.fanli.service.inter.msg.UserInviteMsgNotificationService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;

import com.yeshi.fanli.service.inter.user.UserActiveLogService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

@@ -62,6 +63,13 @@
   

   @Resource

   private UserActiveLogService userActiveLogService;

	
   @Resource

   private UserInfoExtraService userInfoExtraService;

	
   @Resource

   private ThreeSaleExtraInfoSerivce threeSaleExtraInfoSerivce;

	
   

   @Resource(name = "taskExecutor")

   private TaskExecutor executor;

@@ -341,7 +349,7 @@
   public List<ThreeSale> listbyIdAndBossId(Long id, Long uid, Integer expire) {

      return threeSaleMapper.listbyIdAndBossId(id, uid, expire);

   }



	
   @Override

   public JSONObject getMyFirstTeam(long start, int count, Long uid, Integer state) {



@@ -481,7 +489,8 @@


      return result;

   }



	
	
   @Override

   public List<ThreeSale> listByWorkerId(Long workerId) {

      return threeSaleMapper.listByWorkerId(workerId);

@@ -494,7 +503,7 @@


   @Override

   @Transactional

   public void bindRelationshipByInviteCode(UserInfo invitee, UserInfo inviter, String platform, String version) throws ThreeSaleException {

   public void bindRelationshipByInviteCode(UserInfo invitee, UserInfo inviter) throws ThreeSaleException {



      if (invitee == null || inviter == null) 

         throw new ThreeSaleException(1, "用户信息为空");

@@ -504,6 +513,8 @@


      if (threeSale != null) {

         // 有效关系--生效

         threeSale.setBoss(inviter);

         threeSale.setWorker(invitee);

         threeSale.setState(true);

         threeSale.setExpire(ThreeSale.EXPIRE_NORMAL);

         threeSale.setSucceedTime(java.lang.System.currentTimeMillis());

@@ -579,7 +590,7 @@


   @Override

   @Transactional

   public void bindRelationshipByWX(UserInfo invitee, Long inviterId, ThreeSale threeSaleOld, String platform, String version) throws ThreeSaleException {

   public void bindRelationshipByWX(UserInfo invitee, Long inviterId, ThreeSale threeSaleOld) throws ThreeSaleException {



      if (invitee == null || (inviterId == null && threeSaleOld == null))

         throw new ThreeSaleException(1, "用户信息为空");

@@ -622,6 +633,7 @@
      

      UserInfo boss = userInfoService.selectByPKey(threeSale.getBoss().getId());

      threeSale.setBoss(boss);

      threeSale.setWorker(invitee);

      

      // 添加到队列

      ThreeSaleCMQManager.getInstance().addThreeSaleMsg(threeSale);

@@ -694,5 +706,16 @@
   public List<ThreeSale> getSuccessByDate(Long bossId, Long minTime, Long maxTime){

      return threeSaleMapper.getSuccessByDate(bossId, minTime, maxTime);

   }

	
	
   @Override

   public List<ThreeSale> listFirstTeam(long start, int count, Long uid, Integer state) {

      return threeSaleMapper.listFirstTeam(start, count, uid, state);

   }

	
   @Override

   public List<ThreeSale> listSecondTeam(long start, int count, Long uid, Integer state) {

      return threeSaleMapper.listSecondTeam(start, count, uid, state);

   }



}