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

yujian

2019-07-19 4c31405418bdd063605f1e5821d99f85be02f23c

 fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinOriginServiceImpl.java

@@ -404,19 +404,31 @@


   @Override

   public void overdueHongBao(Long uid) {

      // 15天前过期

      Date date = null;

      if (uid == null) {

         return;

      }

		
      // 15天前过期- 非等级红包

      try {

         date = DateUtil.reduceDay(14, new Date());

         Date date = DateUtil.reduceDay(14, new Date());

         List<UserTaoLiJinOrigin> list = userTaoLiJinOriginMapper.getOverdueTaoLiJin(uid, date);

         executeOverdueHongBao(uid, date, list);

      } catch (ParseException e) {

         e.printStackTrace();

      }

      

      if (date == null) {

         return;

      // 30天前过期 - 等级红包

      try {

         Date date = DateUtil.reduceDay(29, new Date());

         List<UserTaoLiJinOrigin> list = userTaoLiJinOriginMapper.getOverdueTaoLiJinByRank(uid, date);

         executeOverdueHongBao(uid, date, list);

      } catch (ParseException e) {

         e.printStackTrace();

      }

      }

      

      List<UserTaoLiJinOrigin> list = userTaoLiJinOriginMapper.getOverdueTaoLiJin(uid, date);

	
   public void executeOverdueHongBao(Long uid, Date date, List<UserTaoLiJinOrigin> list) {

      if (list == null || list.size() == 0) {

         return;

      }

@@ -497,7 +509,6 @@
      updateExtra.setUpdateTime(new Date());

      userMoneyExtraService.updateByPrimaryKeySelective(updateExtra);

      

		
      // 插入明细

      UserTaoLiJinDetail detail = new UserTaoLiJinDetail();

      detail.setUid(uid);

@@ -508,6 +519,7 @@
      userTaoLiJinDetailService.insertSelective(detail);

   }



	
   @Override

   public List<UserTaoLiJinOrigin> getSurplusLiJin(long uid) {

      return userTaoLiJinOriginMapper.getSurplusLiJin(uid);