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

admin

2019-12-14 1261c227e7ad47607ee651bbd017ea80eb6d044a

 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;