From da36dbefcd945cc85d170c5c2e78682d13497f97 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 26 八月 2019 17:46:24 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskRecordServiceImpl.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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..6b272d8 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());
@@ -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