From 774a788ee1c5f6b94e3eed68145601c02c977ea8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 21 八月 2019 15:25:34 +0800
Subject: [PATCH] 签到修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralTaskClassServiceImpl.java | 79 ++++-----------------------------------
1 files changed, 9 insertions(+), 70 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 c98c514..8e01a2f 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;
@@ -54,63 +53,7 @@
@Override
public List<IntegralTaskClassVO> getIntegralTaskClassVO(Long uid, long start, int count) {
- // 鐢ㄦ埛绛惧埌
- Integer baseGoldCoin = 5;
- boolean dailySign = false;
- if (start == 0) { // 绗竴椤电鍒�
- try {
- baseGoldCoin = finishedDailySign(uid);
- dailySign = true;
- } 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) {
- taskClassVO.setTotalCoin(baseGoldCoin);
- taskClassVO.setLightUp(dailySign);
- } 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 (!dailySign && uniqueKey == UniqueKeyEnum.dailySign) {
- progress = "鏈鍒�";
- taskClassVO.setBtnName("绛惧埌");
- }
- taskClassVO.setProgress(progress);
- }
- return listVo;
+ return integralTaskClassMapper.getIntegralTaskClassVO(start, count);
}
@@ -132,39 +75,34 @@
*/
@Transactional
public Integer finishedDailySign(long uid) throws Exception{
- Integer baseGoldCoin = 5;
-
IntegralTaskClass taskClass = getByUniqueKey(UniqueKeyEnum.dailySign.name());
if (taskClass == null || taskClass.getState() == null || taskClass.getState() != 1)
- return baseGoldCoin;
+ throw new Exception("鎶涘嚭寮傚父锛氫换鍔″垎绫讳笉瀛樺湪");
Long cid = taskClass.getId();
-
// 浠婃棩宸茬鍒板畬鎴�
if (integralTaskRecordService.isToDaySign(uid, cid))
- return baseGoldCoin;
+ return 2;
// 浠诲姟
Integer num = integralTaskRecordService.getNowdaySignNum(uid, cid);
String uniqueKey = UniqueKeyEnum.dailySign.name() + num;
IntegralTask integralTask = integralTaskService.getByCidAndUniqueKey(cid, uniqueKey);
if (integralTask == null)
- return baseGoldCoin;
+ throw new Exception("鎶涘嚭寮傚父锛氫换鍔′笉瀛樺湪");
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
if (userInfoExtra == null)
- return baseGoldCoin;
+ throw new Exception("鎶涘嚭寮傚父锛氶澶栦俊鎭笉瀛樺湪");
UserRank userRank = userInfoExtra.getUserRank();
if (userRank == null)
- return baseGoldCoin;
+ throw new Exception("鎶涘嚭寮傚父锛氱瓑绾т俊鎭笉瀛樺湪");
Integer goldCoin = integralTask.getGoldCoin();
Integer baseDoubleNum = integralTask.getDoubleNum();
if (baseDoubleNum != null && baseDoubleNum > 0)
goldCoin = goldCoin * baseDoubleNum;
-
- baseGoldCoin = goldCoin;
// 鏍规嵁绛夌骇璁＄畻鏄惁澧炲姞鎴栧姞鍊�
Long taskId = integralTask.getId();
@@ -181,7 +119,8 @@
}
// 鍔犲叆璁板綍
integralTaskRecordService.finishedTask(uid, cid, taskId, goldCoin);
- return baseGoldCoin;
+
+ return 1;
}
@@ -220,7 +159,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