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

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java

@@ -1,7 +1,8 @@
package com.yeshi.fanli.service.impl.integral;



import java.text.ParseException;

import java.text.SimpleDateFormat;

import java.util.ArrayList;

import java.util.Collections;

import java.util.Date;

import java.util.List;

import java.util.Set;

@@ -105,14 +106,14 @@
      }



      if (num > 7) {

         num = 1;

         num = 7;

      }

      return num;

   }



   @Override

   public List<Date> getSignDays(long uid, Long cid) {

      List<Date> listDate = new ArrayList<Date>();

   public List<IntegralTaskRecord> getSignDaysRecord(long uid, Long cid) {

      List<IntegralTaskRecord> listRecord = new ArrayList<IntegralTaskRecord>();

      try {

         // 签到时间正序序查询近7天数据

         List<IntegralTaskRecord> list = integralTaskRecordMapper.listDaySignRecord(uid, cid);

@@ -124,16 +125,13 @@
                  break; // 天数未连续

               }

               date = createTime;

               listDate.add(record.getCreateTime());

               listRecord.add(record);

            }

         }

      } catch (Exception e) {

         LogHelper.errorDetailInfo(e);

      }



      // 倒序

      Collections.reverse(listDate);

      return listDate;

      return listRecord;

   }



   @Override

@@ -255,22 +253,47 @@
      // 加入明细

      IntegralDetail detail = new IntegralDetail();

      if (UniqueKeyEnum.dailySign == taskClass.getUniqueKey()) {

         detail.setTitle(taskClass.getName() + "-" + integralTask.getName());

         SimpleDateFormat format = new SimpleDateFormat("yy-MM-dd HH:mm:ss");

         Date recordTime = record.getCreateTime();

         List<IntegralTaskRecord> list = integralTaskRecordMapper.listSignRecordByDateTime(uid, cid,

               format.format(recordTime));

         int num = 1;

         if (list != null && list.size() > 0) {

            try {

               Date nextDate = null;

               for (IntegralTaskRecord tntegralTaskRecord : list) {

                  if (nextDate == null) {

                     nextDate = tntegralTaskRecord.getCreateTime();

                     continue;

                  }



                  if (DateUtil.daysBetween2(tntegralTaskRecord.getCreateTime(), nextDate) != 1) {

                     break; // 天数未连续

                  }

                  nextDate = tntegralTaskRecord.getCreateTime();

                  num++;

               }

            } catch (ParseException e) {

               e.printStackTrace();

            }

         }

         detail.setTitle(taskClass.getName() + "-第" + num + "天");

      } else {

         int num = 0;

         FrequencyEnum frequency = integralTask.getFrequency();

         if (frequency == FrequencyEnum.everyday) {

            num = integralTaskRecordMapper.countByTaskIdTodayNum(uid, taskId, TimeUtil.getWholeTime(record.getCreateTime().getTime()));

            num = integralTaskRecordMapper.countByTaskIdTodayNum(uid, taskId,

                  TimeUtil.getWholeTime(record.getCreateTime().getTime()));

         } else if (frequency == FrequencyEnum.onlyOne) {

            num = 1;

         }

			


         if (num <= 0)

            num = 1;

         String title = taskClass.getName() + "-" + integralTask.getName() + "-" + num + "次";

         detail.setTitle(title);

      }

		


      detail.setUid(uid);

      detail.setMoney(record.getGoldCoin());

      detail.setCreateTime(record.getCreateTime());

@@ -280,9 +303,9 @@
   }



   @Override

   public Integer countGetCountByTaskIdAndDay(Long taskId, Long uid, Date day) {

   public int countGetCountByTaskIdAndDay(Long taskId, Long uid, Date day) {

      if (day == null)

         return null;

         return 0;

      Date minTime = new Date(

            TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(day.getTime(), "yyyy-MM-dd"), "yyyy-MM-dd"));

      Date maxTime = new Date(minTime.getTime() + 1000 * 60 * 60 * 24L);

@@ -306,4 +329,16 @@
      integralTaskRecordMapper.insertSelective(record);

      return record;

   }



   @Override

   public List<IntegralTaskRecord> listByCidAndUidAndCreateTime(Long cid, Long uid, Date minTime, Date maxTime,

         int page, int count) {

      return integralTaskRecordMapper.listByCidAndUidAndCreateTime(cid, uid, minTime, maxTime, (page - 1) * count,

            count);

   }



   @Override

   public long countByCidAndUidAndCreateTime(Long cid, Long uid, Date minTime, Date maxTime) {

      return integralTaskRecordMapper.countByCidAndUidAndCreateTime(cid, uid, minTime, maxTime);

   }

}