yujian
2019-07-17 20d1a38a0f8049873f1fbbaef96c22e971ea9d77
fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinOriginServiceImpl.java
@@ -407,7 +407,7 @@
      // 15天前过期
      Date date = null;
      try {
         date = DateUtil.reduceDay(15, new Date());
         date = DateUtil.reduceDay(14, new Date());
      } catch (ParseException e) {
         e.printStackTrace();
      }
@@ -423,16 +423,27 @@
      
      BigDecimal total = new BigDecimal(0);
      for (UserTaoLiJinOrigin userTaoLiJinOrigin: list) {
         SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd HH.mm");
         String time = sd.format(userTaoLiJinOrigin.getCreateTime());
         BigDecimal moneySurplus = userTaoLiJinOrigin.getMoneySurplus();
         total = MoneyBigDecimalUtil.add(total, moneySurplus);
         String rightsId = null;
         boolean refund = false;
         TaoLiJinOriginEnum originEnum = userTaoLiJinOrigin.getOrigin();
         if (TaoLiJinOriginEnum.refund.equals(originEnum)) {
            refund = true;
            rightsId = userTaoLiJinOrigin.getRightsId();
         }
         UserTaoLiJinOrigin origin = new UserTaoLiJinOrigin();
         origin.setId(userTaoLiJinOrigin.getId());
         origin.setMoneySurplus(new BigDecimal(0));
         origin.setUpdateTime(new Date());
         userTaoLiJinOriginMapper.updateByPrimaryKeySelective(origin);
         
         SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd hh.mm");
         String time = sd.format(userTaoLiJinOrigin.getCreateTime());
         if (origin.getOrigin().equals(TaoLiJinOriginEnum.refund)) {
            String rightsId = userTaoLiJinOrigin.getRightsId();
         if (refund) {
            UserTaoLiJinReport report = userTaoLiJinReportService.selectByPrimaryKey(rightsId);
            Date shareTime = null;
            if (report == null) {
@@ -446,7 +457,7 @@
            content.setState("红包收回");
            content.setSource("于["+ sd.format(shareTime) + "]创建的分享未被领取部分");
            content.setTimeDesc("退回于" + time);
            content.setMoney(userTaoLiJinOrigin.getMoneySurplus());
            content.setMoney(moneySurplus);
            content.setReason("本笔退回推广红包从退回日起至今并未产生分享记录");
            content.setResult("长期未使用收回");
            userOtherMsgNotificationService.taoLiJinMsg(uid, "如有疑问请联系人工客服", content);
@@ -455,16 +466,13 @@
            // 消息
            MsgOtherTaoLiJinContentDTO content = new MsgOtherTaoLiJinContentDTO();
            content.setState("红包收回");
            content.setSource(origin.getOrigin().getDesc());
            content.setSource(originEnum.getDesc());
            content.setTimeDesc("获得于" + time);
            content.setMoney(userTaoLiJinOrigin.getMoneySurplus());
            content.setMoney(moneySurplus);
            content.setReason("本笔推广红包从获得日起至今并未产生分享记录");
            content.setResult("长期未使用收回");
            userOtherMsgNotificationService.taoLiJinMsg(uid, "如有疑问请联系人工客服", content);
         }
         total = MoneyBigDecimalUtil.add(total, userTaoLiJinOrigin.getMoneySurplus());
      }
      
      // 用户剩余淘礼金