From d1bcc87e41d8d176ce58ee9e27a17ec93d0d7cb2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 23 八月 2019 11:59:18 +0800
Subject: [PATCH] Merge branch 'mater-1.6.0' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskClassServiceImpl.java | 68 ++++------------------------------
1 files changed, 8 insertions(+), 60 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 672a63f..6ba9b92 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
@@ -25,7 +25,6 @@
import com.yeshi.fanli.service.inter.integral.IntegralTaskRecordService;
import com.yeshi.fanli.service.inter.integral.IntegralTaskService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
-import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.vo.integral.DailySignVO;
import com.yeshi.fanli.vo.integral.IntegralTaskClassVO;
import com.yeshi.fanli.vo.integral.SignDateVO;
@@ -53,65 +52,14 @@
@Override
+ public IntegralTaskClass selectByPrimaryKey(Long id) {
+ return integralTaskClassMapper.selectByPrimaryKey(id);
+ }
+
+
+ @Override
public List<IntegralTaskClassVO> getIntegralTaskClassVO(Long uid, long start, int count) {
- // 鐢ㄦ埛绛惧埌
- Integer signState = 0;
- if (start == 0) {
- try {
- signState = finishedDailySign(uid);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- List<IntegralTaskClassVO> listVo = integralTaskClassMapper.getIntegralTaskClassVO(start, count);
- if (listVo == null || listVo.size() == 0) {
- return listVo;
- }
-
- for (IntegralTaskClassVO taskClassVO : listVo) {
- String progress = taskClassVO.getProgress();
- if (StringUtil.isNullOrEmpty(progress))
- continue;
-
- Integer taskNum = taskClassVO.getTaskNum();
- if (taskNum == null)
- continue;
-
- UniqueKeyEnum uniqueKey = taskClassVO.getUniqueKey();
- if (uniqueKey == UniqueKeyEnum.dailySign) {
- if (signState == 0) {
- taskClassVO.setLightUp(true); // 绛惧埌澶辫触
- } else if (signState == 1) {
- taskClassVO.setLightUp(false);
- } else if (signState == 2) {
- taskClassVO.setLightUp(false);
- }
- } else {
- taskClassVO.setLightUp(true);
- }
-
- Integer dateType = 1; // 鏌ヨ褰撴棩
- if (uniqueKey == UniqueKeyEnum.orderReward)
- dateType = null; // 鏌ヨ鍘嗗彶
-
- Long id = taskClassVO.getId();
- int countFinished = 0;
- Integer totalGoldCoin = integralTaskRecordService.getTotalGoldCoin(uid, id, dateType);
- if (totalGoldCoin != null && totalGoldCoin > 0) {
- taskClassVO.setFinishedCoin("+" + totalGoldCoin);
- if (uniqueKey != UniqueKeyEnum.dailySign)
- countFinished = integralTaskRecordService.countFinished(uid, id, dateType);
- }
- progress = progress.replace("{宸插畬鎴恾", countFinished + "").replace("{鎬讳换鍔", taskNum + "");
-
- if (signState == 0 && uniqueKey == UniqueKeyEnum.dailySign) {
- progress = "鏈鍒�";
- taskClassVO.setBtnName("绛惧埌");
- }
- taskClassVO.setProgress(progress);
- }
- return listVo;
+ return integralTaskClassMapper.getIntegralTaskClassVO(start, count);
}
@@ -217,7 +165,7 @@
}
for (int i = 1; i <= 7- listDays.size(); i ++) {
- String after = format.format(DateUtil.reduceDay(i, date));
+ String after = format.format(DateUtil.plusDayDate(i, date));
if (after.startsWith("0"))
after = after.substring(1, after.length());
--
Gitblit v1.8.0