Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

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

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


import javax.annotation.Resource;



import org.springframework.context.annotation.Lazy;

import org.springframework.core.task.TaskExecutor;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

@@ -71,17 +72,16 @@
   @Resource

   private ThreeSaleExtraInfoSerivce threeSaleExtraInfoSerivce;

   

	
   @Lazy

   @Resource

   private IntegralGetService  integralGetService;

	
	
   

   @Resource(name = "taskExecutor")

   private TaskExecutor executor;

   

	


   public UserInfo getBoss(final long uid) {

      //TODO 有bug

      return threeSaleMapper.selectBoss(uid);

   }



@@ -328,12 +328,10 @@
      return threeSaleMapper.countSuperiorQuery(state, uid);

   }





   @Override

   public long countFirstTeam(Long uid, Integer state) {

      return threeSaleMapper.countFirstTeam(uid, state);

   }





   @Override

   public long countSecondTeam(Long uid, Integer state) {

@@ -495,7 +493,6 @@
      return result;

   }

   

	
   @Override

   public List<ThreeSale> listByWorkerId(Long workerId) {

      return threeSaleMapper.listByWorkerId(workerId);

@@ -594,12 +591,12 @@
         }

      });

      

		
   }



   @Override

   @Transactional

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

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

         throws ThreeSaleException {



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

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

@@ -650,7 +647,6 @@
      // 邀请消息

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

      

		
      executor.execute(new Runnable() {

         @Override

         public void run() {

@@ -699,7 +695,6 @@
      return threeSaleMapper.getByWorkerId(workerId);

   }

   

	
   @Override

   public long countSuccessFirstTeam(Long uid) {

      return threeSaleMapper.countFirstTeam(uid, 1);

@@ -710,12 +705,10 @@
      return threeSaleMapper.selectSuccessByWorkerId(workerId);

   }

   

	
   @Override

   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) {