From 051e1e78cd217d14ca34c26afe485b6c9c85c01d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 12 九月 2019 16:42:04 +0800
Subject: [PATCH] 订单调整
---
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskClassServiceImpl.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskClassServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskClassServiceImpl.java
index a70cd45..75d30b8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskClassServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskClassServiceImpl.java
@@ -139,16 +139,19 @@
if (taskClass == null || taskClass.getState() == null || taskClass.getState() != 1)
return null;
+ DailySignVO dailySignVO = new DailySignVO();
+
Long cid = taskClass.getId();
- List<IntegralTaskRecord> listRecord = integralTaskRecordService.getSignDaysRecord(uid, cid);
- if (listRecord != null && listRecord.size() > 0) {
- for (int i = listRecord.size() - 1; i >= 0; i--) {
- IntegralTaskRecord taskRecord = listRecord.get(i);
+ List<IntegralTaskRecord> listRecord7Days = integralTaskRecordService.getSign7DaysRecord(uid, cid);
+ if (listRecord7Days != null && listRecord7Days.size() > 0) {
+ for (int i = listRecord7Days.size() - 1; i >= 0; i--) {
+ IntegralTaskRecord taskRecord = listRecord7Days.get(i);
SignDateVO signDateVO = new SignDateVO();
signDateVO.setLightUp(true);
signDateVO.setGoldCoin("+" + taskRecord.getGoldCoin());
if(i == 0) {
signDateVO.setDate("浠婃棩");
+ dailySignVO.setGoldCoin(taskRecord.getGoldCoin());
} else {
String before = format.format(taskRecord.getCreateTime());
if (before.startsWith("0"))
@@ -156,11 +159,19 @@
signDateVO.setDate(before);
}
listSign.add(signDateVO);
+
+ if (listSign.size() >= 7) {
+ break;
+ }
}
}
- DailySignVO dailySignVO = new DailySignVO();
- dailySignVO.setDays(listSign.size());
+ List<IntegralTaskRecord> listRecord = integralTaskRecordService.getSignDaysRecord(uid, cid);
+ if(listRecord == null) {
+ dailySignVO.setDays(0);
+ } else {
+ dailySignVO.setDays(listRecord.size());
+ }
if (listSign.size() < 7) {
List<IntegralTask> listTask = integralTaskService.listByCid(cid);
@@ -200,6 +211,11 @@
j++;
}
}
+
+ if (listSign.size() > 7) {
+ listSign = listSign.subList(listSign.size() - 7, listSign.size() - 1);
+ }
+
dailySignVO.setListDate(listSign);
return dailySignVO;
}
--
Gitblit v1.8.0