From 565c0a03a299de5a619f4d5b5fe593e46dbf35dd Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 28 八月 2019 15:07:58 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralGetServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralGetServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralGetServiceImpl.java
index e41be32..465211d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralGetServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralGetServiceImpl.java
@@ -13,9 +13,9 @@
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.user.UserRank;
import com.yeshi.fanli.entity.integral.IntegralTask;
-import com.yeshi.fanli.entity.integral.IntegralTaskRank;
import com.yeshi.fanli.entity.integral.IntegralTask.FrequencyEnum;
import com.yeshi.fanli.entity.integral.IntegralTask.TaskUniqueKeyEnum;
+import com.yeshi.fanli.entity.integral.IntegralTaskRank;
import com.yeshi.fanli.entity.integral.IntegralTaskRecord;
import com.yeshi.fanli.exception.integral.IntegralGetException;
import com.yeshi.fanli.exception.integral.IntegralTaskRecordException;
@@ -44,10 +44,10 @@
@Resource
private RedisManager redisManager;
-
+
@Resource
private UserInfoExtraService userInfoExtraService;
-
+
@Resource
private IntegralTaskRankService integralTaskRankService;
@@ -79,19 +79,19 @@
if (count > 0)
throw new IntegralGetException(2, "浜嬩欢瑙﹀彂杈惧埌涓婇檺");
}
-
+
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
if (userInfoExtra == null)
throw new IntegralGetException(2, "棰濆淇℃伅涓嶅瓨鍦�");
-
+
UserRank userRank = userInfoExtra.getUserRank();
if (userRank == null)
- throw new IntegralGetException(2,"绛夌骇淇℃伅涓嶅瓨鍦�");
+ throw new IntegralGetException(2, "绛夌骇淇℃伅涓嶅瓨鍦�");
int goldCoin = task.getGoldCoin();
if (task.getDoubleNum() != null && task.getDoubleNum() > 0)
goldCoin = task.getDoubleNum() * goldCoin;
-
+
Long taskId = task.getId();
IntegralTaskRank traskRank = integralTaskRankService.getByTsakIdAndRankId(taskId, userRank.getId());
if (traskRank != null) {
--
Gitblit v1.8.0