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/controller/client/v2/IntegralControllerV2.java | 7 +------
1 files changed, 1 insertions(+), 6 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 b812602..842c6da 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
@@ -55,7 +55,6 @@
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
import com.yeshi.fanli.vo.integral.DailySignVO;
import com.yeshi.fanli.vo.integral.ExchangeTipVO;
import com.yeshi.fanli.vo.integral.IntegralDetailVO;
@@ -138,7 +137,6 @@
// 鐢ㄦ埛绛惧埌
Integer signState = 0;
- int signDays = 1;
if (page == 1) {
// 绛惧埌
@@ -168,9 +166,6 @@
// 绛惧埌鏃ユ湡淇℃伅
DailySignVO dailySignVO = integralTaskClassService.getDailySignList(uid, userRank.getId());
- if (dailySignVO != null) {
- signDays = dailySignVO.getDays();
- }
boolean ejectSign = false;
if (signState == 1)
@@ -409,6 +404,7 @@
out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
}
}
+
/**
* 鍏戞崲閲戝竵
@@ -528,7 +524,6 @@
try {
record = integralGetService.addEventStatistic(uid, event, null);
} catch (IntegralGetException e) {
- e.printStackTrace();
}
if (record == null) {
out.print(JsonUtil.loadFalseResult("娣诲姞澶辫触"));
--
Gitblit v1.8.0