From 7f2f5ef5637a6871f4329e464eeba97eb59e94a3 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 21 八月 2019 10:45:38 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 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 0a16be2..ce38a85 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
@@ -33,6 +33,9 @@
import com.yeshi.fanli.entity.bus.user.UserRank;
import com.yeshi.fanli.entity.integral.CodePublishRecord;
import com.yeshi.fanli.entity.integral.IntegralExchange;
+import com.yeshi.fanli.entity.integral.IntegralTask;
+import com.yeshi.fanli.entity.integral.IntegralTaskClass;
+import com.yeshi.fanli.entity.integral.IntegralTaskRank;
import com.yeshi.fanli.entity.integral.IntegralTaskClass.UniqueKeyEnum;
import com.yeshi.fanli.entity.integral.IntegralTaskRecord;
import com.yeshi.fanli.exception.integral.IntegralExchangeException;
@@ -44,7 +47,9 @@
import com.yeshi.fanli.service.inter.integral.IntegralExchangeRecordService;
import com.yeshi.fanli.service.inter.integral.IntegralExchangeService;
import com.yeshi.fanli.service.inter.integral.IntegralTaskClassService;
+import com.yeshi.fanli.service.inter.integral.IntegralTaskRankService;
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.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.Constant;
@@ -85,9 +90,15 @@
@Resource
private IntegralDetailService integralDetailService;
+
+ @Resource
+ private IntegralTaskRankService integralTaskRankService;
@Resource
private CodePublishRecordService codePublishRecordService;
+
+ @Resource
+ private IntegralTaskService integralTaskService;
/**
* 鑾峰彇浠诲姟鍒楄〃
@@ -122,6 +133,7 @@
// 鐢ㄦ埛绛惧埌
Integer signState = 0;
+ int signDays = 1;
if (page == 1) {
// 绛惧埌
@@ -151,7 +163,10 @@
// 绛惧埌鏃ユ湡淇℃伅
DailySignVO dailySignVO = integralTaskClassService.getDailySignList(uid, userRank.getId());
-
+ if (dailySignVO != null) {
+ signDays = dailySignVO.getDays();
+ }
+
boolean ejectSign = false;
if (signState == 1)
ejectSign = true;
@@ -182,6 +197,20 @@
} else if (signState == 2) {
taskClassVO.setLightUp(false);
}
+
+ // 鏍规嵁澶╂暟鍙樺寲鏇存敼绛惧埌閲戦
+ Integer num = integralTaskRecordService.getNowdaySignNum(uid, taskClassVO.getId());
+
+ String uniqueKeyTask = UniqueKeyEnum.dailySign.name() + num;
+ IntegralTask integralTask = integralTaskService.getByCidAndUniqueKey(taskClassVO.getId(), uniqueKeyTask);
+ Integer goldCoin = 0;
+ if (integralTask != null) {
+ goldCoin = integralTask.getGoldCoin();
+ Integer baseDoubleNum = integralTask.getDoubleNum();
+ if (baseDoubleNum != null && baseDoubleNum > 0)
+ goldCoin = goldCoin * baseDoubleNum;
+ }
+ taskClassVO.setTotalCoin(goldCoin);
} else {
taskClassVO.setLightUp(true);
}
@@ -617,9 +646,9 @@
}
// 鏌ヨ鍒楄〃
- List<IntegralDetailVO> list = integralDetailService.listDetailForClient(uid, index, date);
+ List<IntegralDetailVO> list = integralDetailService.listDetailForClient(uid, index, date, type);
// 缁熻鎬绘潯鏁�
- long count = integralDetailService.countDetailForClient(uid, index, date);
+ long count = integralDetailService.countDetailForClient(uid, index, date, type);
GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
gsonBuilder.registerTypeAdapter(TaoLiJinDetailTypeEnum.class, new TypeAdapter<TaoLiJinDetailTypeEnum>() {
--
Gitblit v1.8.0