From e6764831a890de26fcfebb4fb8f3a22e9f8cc816 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 16:09:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 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 addd037..2fcb36b 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
@@ -255,10 +255,11 @@
if (UniqueKeyEnum.dailySign == taskClass.getUniqueKey()) {
SimpleDateFormat format = new SimpleDateFormat("yy-MM-dd HH:mm:ss");
Date recordTime = record.getCreateTime();
- List<IntegralTaskRecord> list = integralTaskRecordMapper.listSignRecordByDateTime(uid, cid, format.format(recordTime));
+ List<IntegralTaskRecord> list = integralTaskRecordMapper.listSignRecordByDateTime(uid, cid,
+ format.format(recordTime));
int num = 1;
if (list != null && list.size() > 0) {
- try {
+ try {
Date nextDate = null;
for (IntegralTaskRecord tntegralTaskRecord : list) {
if (nextDate == null) {
@@ -281,17 +282,18 @@
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());
@@ -301,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);
@@ -327,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);
+ }
}
--
Gitblit v1.8.0