From d1dccd08a249b830a95eeeb04af25f87d5c056be Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 03 九月 2019 11:13:04 +0800
Subject: [PATCH] 金币明细bug
---
fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralGetServiceImpl.java | 48 ++++++++++++++++++++++++++++--------------------
1 files changed, 28 insertions(+), 20 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..aebac99 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) {
@@ -143,8 +142,8 @@
return null;
}
-
- @IntegralGetFrequencyLimit(key = "'addShareInvite-'+#uid")
+
+ @IntegralGetFrequencyLimit(key = "'addShareInvite-'+#uid", time = 30)
@Override
public IntegralTaskRecord addShareInvite(Long uid) {
try {
@@ -247,6 +246,7 @@
}
@IntegralGetVersionLimit(uid = "#uid")
+ @IntegralGetFrequencyLimit(key = "'taoLiJinBuy-'+#uid", time = 30)
@Async()
@Override
public void addTaoLiJinBuy(Long uid, Long goodsId) {
@@ -288,6 +288,7 @@
}
@IntegralGetVersionLimit(uid = "#uid")
+ @IntegralGetFrequencyLimit(key = "'shareSingleGoods-'+#uid", time = 45)
@Async()
@Override
public void addShareSingleGoods(Long uid) {
@@ -299,6 +300,7 @@
}
@IntegralGetVersionLimit(uid = "#uid")
+ @IntegralGetFrequencyLimit(key = "'shareMultipleGoods-'+#uid", time = 45)
@Async()
@Override
public void addShareMultipleGoods(Long uid) {
@@ -310,6 +312,7 @@
}
@IntegralGetVersionLimit(uid = "#uid")
+ @IntegralGetFrequencyLimit(key = "'shareTLJGoods-'+#uid", time = 45)
@Async()
@Override
public void addShareTLJGoods(Long uid) {
@@ -354,6 +357,7 @@
}
@IntegralGetVersionLimit(uid = "#uid")
+ @IntegralGetFrequencyLimit(key = "'closeRecommendGoods-'+#uid", time = 30)
@Async()
@Override
public void addCloseRecommendGoods(Long uid) {
@@ -365,6 +369,7 @@
}
@IntegralGetVersionLimit(uid = "#uid")
+ @IntegralGetFrequencyLimit(key = "'couponRebate-'+#uid", time = 30)
@Async()
@Override
public void addCouponRebate(Long uid) {
@@ -418,10 +423,6 @@
@Override
public void addRebateOrder(Long uid) {
try {
- UserInfo boss = getBossByUid(uid);
- if (boss != null)
- addInviteOrderLevelOne(boss.getId());
-
addEventStatistic(uid, TaskUniqueKeyEnum.rebateOrder.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
@@ -435,12 +436,9 @@
*/
@IntegralGetVersionLimit(uid = "#uid")
@Async()
- private void addInviteOrderLevelOne(Long uid) {
+ @Override
+ public void addInviteOrderLevelOne(Long uid) {
try {
- UserInfo boss = getBossByUid(uid);
- if (boss != null)
- addInviteOrderLevelTwo(boss.getId());
-
addEventStatistic(uid, TaskUniqueKeyEnum.inviteOrderLevelOne.name());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
@@ -454,7 +452,8 @@
*/
@IntegralGetVersionLimit(uid = "#uid")
@Async()
- private void addInviteOrderLevelTwo(Long uid) {
+ @Override
+ public void addInviteOrderLevelTwo(Long uid) {
try {
addEventStatistic(uid, TaskUniqueKeyEnum.inviteOrderLevelTwo.name());
} catch (Exception e) {
@@ -474,6 +473,7 @@
}
@IntegralGetVersionLimit(uid = "#uid")
+ @IntegralGetFrequencyLimit(key = "'bindWeiXin-'+#uid", time = 30)
@Async()
@Override
public void addBindWeiXin(Long uid) {
@@ -485,6 +485,7 @@
}
@IntegralGetVersionLimit(uid = "#uid")
+ @IntegralGetFrequencyLimit(key = "'bindPhone-'+#uid", time = 30)
@Async()
@Override
public void addBindPhone(Long uid) {
@@ -496,6 +497,7 @@
}
@IntegralGetVersionLimit(uid = "#uid")
+ @IntegralGetFrequencyLimit(key = "'bindTaoBao-'+#uid", time = 30)
@Async()
@Override
public void addBindTaoBao(Long uid) {
@@ -507,6 +509,7 @@
}
@IntegralGetVersionLimit(uid = "#uid")
+ @IntegralGetFrequencyLimit(key = "'setWeiXinNum-'+#uid", time = 30)
@Async()
@Override
public void addSetWeiXinNum(Long uid) {
@@ -518,6 +521,7 @@
}
@IntegralGetVersionLimit(uid = "#uid")
+ @IntegralGetFrequencyLimit(key = "'setGender-'+#uid", time = 30)
@Async()
@Override
public void addSetGender(Long uid) {
@@ -529,6 +533,7 @@
}
@IntegralGetVersionLimit(uid = "#uid")
+ @IntegralGetFrequencyLimit(key = "'setPortrait-'+#uid", time = 30)
@Async()
@Override
public void addSetPortrait(Long uid) {
@@ -540,6 +545,7 @@
}
@IntegralGetVersionLimit(uid = "#uid")
+ @IntegralGetFrequencyLimit(key = "'setNickName-'+#uid", time = 30)
@Async()
@Override
public void addSetNickname(Long uid) {
@@ -551,6 +557,7 @@
}
@IntegralGetVersionLimit(uid = "#uid")
+ @IntegralGetFrequencyLimit(key = "'bindAlipay-'+#uid", time = 30)
@Async()
@Override
public void addBindAlipay(Long uid) {
@@ -562,6 +569,7 @@
}
@IntegralGetVersionLimit(uid = "#uid")
+ @IntegralGetFrequencyLimit(key = "'inviteActivate-'+#uid", time = 30)
@Async()
@Override
public void addInviteActivate(Long uid) {
--
Gitblit v1.8.0