From 9576c04615fa9d22cad7ea90a60ab335ee57b44e Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 10 九月 2019 15:42:04 +0800
Subject: [PATCH] 金币任务 统计调整
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java
index 3a5dcd9..5bb40a6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java
@@ -183,8 +183,9 @@
data.put("userRank", gson.toJson(userRank));
data.put("dailySign", dailySignVO);
}
-
- for (IntegralTaskClassVO taskClassVO : list) {
+ for(int i = 0; i < list.size(); i++) {
+ IntegralTaskClassVO taskClassVO = list.get(i);
+
UniqueKeyEnum uniqueKey = taskClassVO.getUniqueKey();
// 閭�璇峰ソ鍙嬶細鏄惁婵�娲婚個璇风爜
@@ -233,19 +234,27 @@
taskClassVO.setLightUp(true);
}
- // 鏌ヨ褰撴棩
- Integer dateType = 1;
- if (uniqueKey == UniqueKeyEnum.orderReward || uniqueKey == UniqueKeyEnum.accountMaintain)
- dateType = null; // 鏌ヨ鍘嗗彶
-
- Long id = taskClassVO.getId();
+
int countFinished = 0;
- Integer totalGoldCoin = integralTaskRecordService.getTotalGoldCoin(uid, id, dateType);
+ Long id = taskClassVO.getId();
+ // 鏌ヨ褰撴棩
+ Integer totalGoldCoin = integralTaskRecordService.getTotalGoldCoin(uid, id, 1);
if (totalGoldCoin != null && totalGoldCoin > 0) {
taskClassVO.setFinishedCoin("+" + totalGoldCoin);
- if (uniqueKey != UniqueKeyEnum.dailySign)
- countFinished = integralTaskRecordService.countFinished(uid, id, dateType);
+ if (uniqueKey != UniqueKeyEnum.dailySign && uniqueKey != UniqueKeyEnum.accountMaintain) {
+ countFinished = integralTaskRecordService.countFinished(uid, id, 1);
+ }
}
+
+ if (uniqueKey == UniqueKeyEnum.accountMaintain) {
+ countFinished = integralTaskRecordService.countFinished(uid, id, null); // 鏌ヨ鍘嗗彶
+ }
+
+ /*
+ * // 瀹屽杽淇℃伅瀹屾垚鍚庯紝鍒楄〃涓秷澶� if (uniqueKey == UniqueKeyEnum.accountMaintain && taskNum ==
+ * countFinished) { list.remove(i); i --; continue; }
+ */
+
progress = progress.replace("{宸插畬鎴恾", countFinished + "").replace("{鎬讳换鍔", taskNum + "");
if (signState == 0 && uniqueKey == UniqueKeyEnum.dailySign) {
--
Gitblit v1.8.0