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

admin

2019-12-13 fb1d948a7b64cd02083b7b6f7ae18d16ad638609

 fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java

@@ -336,13 +336,13 @@


   

   @Override

   public List<RedPackWinProgressVO> getInviteProgressByWorkerId(Long uid) {

   public List<RedPackWinProgressVO> getInviteProgressByWorkerId(Long uid, Long tid) {

      List<RedPackWinProgressVO> listVO = new ArrayList<RedPackWinProgressVO>();

      ThreeSale threeSale = threeSaleSerivce.selectByWorkerId(uid);

      ThreeSale threeSale = threeSaleSerivce.getNearRelationByBossIdAndWorkerId(uid, tid);

      if (threeSale == null || threeSale.getSucceedTime() == null)

         return listVO;

      

      UserInfo userInfo = userInfoService.selectByPKey(uid);

      UserInfo userInfo = userInfoService.selectByPKey(tid);

      if (userInfo == null) 

         return listVO;

      

@@ -350,7 +350,7 @@
      listVO.add(new RedPackWinProgressVO("确立邀请", TimeUtil.formatDate(threeSale.getSucceedTime())));

      

      // 奖励记录

      List<RedPackWinInvite> listWin = redPackWinInviteMapper.getWinListByBossIdAndTeamUid(threeSale.getBoss().getId(), uid);

      List<RedPackWinInvite> listWin = redPackWinInviteMapper.getWinListByBossIdAndTeamUid(uid, tid);

      if (listWin == null || listWin.size() == 0) 

         return listVO;