From a99de6e3ab8c984ad274f53ac350fa56548f2374 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 28 八月 2019 14:38:11 +0800 Subject: [PATCH] 自购立减/分享爆款返回数据修改修改 --- fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralGetServiceImpl.java | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 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 13718a6..d56464f 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 @@ -1,7 +1,6 @@ package com.yeshi.fanli.service.impl.integral; import java.util.Date; -import java.util.List; import javax.annotation.Resource; @@ -14,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; @@ -45,10 +44,10 @@ @Resource private RedisManager redisManager; - + @Resource private UserInfoExtraService userInfoExtraService; - + @Resource private IntegralTaskRankService integralTaskRankService; @@ -80,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