专题与banner设置版本管理

admin

2019-12-17 cc88ea25dc395b5d1b9b5ac9ddba7713c667c1c1

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

@@ -99,7 +99,7 @@
   @Transactional(rollbackFor = Exception.class)

   public void inviteSucceedReward(Long teamUid) throws Exception {

      // 是否在上线之后的邀请关系

      ThreeSale threeSale = threeSaleSerivce.getByWorkerIdAndTime(teamUid, TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME));

      ThreeSale threeSale = threeSaleSerivce.getByWorkerIdAndTime(teamUid, TimeUtil.convertDateToTemp(Constant.RED_PACK_ONLINE_TIME));

      if (threeSale == null)

         return;



@@ -190,7 +190,7 @@
         return;



      // 验证上下级关系

      ThreeSale threeSale = threeSaleSerivce.getByWorkerIdAndTime(teamUid, TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME));

      ThreeSale threeSale = threeSaleSerivce.getByWorkerIdAndTime(teamUid, TimeUtil.convertDateToTemp(Constant.RED_PACK_ONLINE_TIME));

      if (threeSale == null || threeSale.getBoss().getId().longValue() != uid.longValue())

         return;



@@ -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;

      

@@ -368,7 +368,7 @@
            continue;

         } 

         

         if (win.getType() == RedPackWinInviteTypeEnum.twoStageReward) {

         if (win.getType() == RedPackWinInviteTypeEnum.threeStageReward) {

            listVO.add(new RedPackWinProgressVO("第三阶段第" + month + "个月", time, money.toString()));

            month ++;

            continue;