From fd9e6797ea4efbed1680287eab16c26f7edeeab4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 28 八月 2019 15:42:02 +0800
Subject: [PATCH] 维护信息查询bug
---
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java | 85 ++++++++++++++++++++++++++++++++----------
1 files changed, 65 insertions(+), 20 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java
index d3e7a83..d89acc3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java
+++ b/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 + "娆�";
+ String title = taskClass.getName() + "-" + integralTask.getName() + "-绗�" + num + "娆�";
detail.setTitle(title);
}
-
+
detail.setUid(uid);
detail.setMoney(record.getGoldCoin());
detail.setCreateTime(record.getCreateTime());
@@ -280,12 +303,17 @@
}
@Override
- public Integer countGetCountByTaskIdAndDay(Long taskId, Long uid, Date day) {
- if (day == null)
- return null;
- 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);
+ public int countGetCountByTaskIdAndDay(Long taskId, Long uid, Date day) {
+ Date minTime = null;
+ Date maxTime = null;
+ if (day == null) {
+ minTime = new Date(TimeUtil.convertToTimeTemp("1970-01-01", "yyyy-MM-dd"));
+ maxTime = new Date(TimeUtil.convertToTimeTemp("2100-01-01", "yyyy-MM-dd"));
+ } else {
+ minTime = new Date(
+ TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(day.getTime(), "yyyy-MM-dd"), "yyyy-MM-dd"));
+ maxTime = new Date(minTime.getTime() + 1000 * 60 * 60 * 24L);
+ }
return integralTaskRecordMapper.countGetCountByTaskIdAndDay(taskId, uid, minTime, maxTime);
}
@@ -306,4 +334,21 @@
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);
+ }
+
+ @Override
+ public List<IntegralTaskRecord> listByUidAndTaskId(Long uid, Long taskId, int page, int count) {
+ return integralTaskRecordMapper.listByUidAndTaskId(uid, taskId, (page - 1) * count, count);
+ }
}
--
Gitblit v1.8.0