| | |
|---|
| | | 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();
|
|---|
| | |
|
|---|
| | | // 邀请好友：是否激活邀请码
|
|---|
| | |
|---|
| | | 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) {
|
|---|
