From 81f4d5a0074dcc0da71ef453e4e02a4d1d7decf5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 03 九月 2019 11:53:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralGetServiceImpl.java |   33 +++++++++++++++++++++------------
 1 files changed, 21 insertions(+), 12 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 d56464f..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
@@ -142,8 +142,8 @@
 
 		return null;
 	}
-
-	@IntegralGetFrequencyLimit(key = "'addShareInvite-'+#uid")
+	
+	@IntegralGetFrequencyLimit(key = "'addShareInvite-'+#uid", time = 30)
 	@Override
 	public IntegralTaskRecord addShareInvite(Long uid) {
 		try {
@@ -246,6 +246,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@IntegralGetFrequencyLimit(key = "'taoLiJinBuy-'+#uid", time = 30)
 	@Async()
 	@Override
 	public void addTaoLiJinBuy(Long uid, Long goodsId) {
@@ -287,6 +288,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@IntegralGetFrequencyLimit(key = "'shareSingleGoods-'+#uid", time = 45)
 	@Async()
 	@Override
 	public void addShareSingleGoods(Long uid) {
@@ -298,6 +300,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@IntegralGetFrequencyLimit(key = "'shareMultipleGoods-'+#uid", time = 45)
 	@Async()
 	@Override
 	public void addShareMultipleGoods(Long uid) {
@@ -309,6 +312,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@IntegralGetFrequencyLimit(key = "'shareTLJGoods-'+#uid", time = 45)
 	@Async()
 	@Override
 	public void addShareTLJGoods(Long uid) {
@@ -353,6 +357,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@IntegralGetFrequencyLimit(key = "'closeRecommendGoods-'+#uid", time = 30)
 	@Async()
 	@Override
 	public void addCloseRecommendGoods(Long uid) {
@@ -364,6 +369,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@IntegralGetFrequencyLimit(key = "'couponRebate-'+#uid", time = 30)
 	@Async()
 	@Override
 	public void addCouponRebate(Long uid) {
@@ -417,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);
@@ -434,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);
@@ -453,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) {
@@ -473,6 +473,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@IntegralGetFrequencyLimit(key = "'bindWeiXin-'+#uid", time = 30)
 	@Async()
 	@Override
 	public void addBindWeiXin(Long uid) {
@@ -484,6 +485,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@IntegralGetFrequencyLimit(key = "'bindPhone-'+#uid", time = 30)
 	@Async()
 	@Override
 	public void addBindPhone(Long uid) {
@@ -495,6 +497,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@IntegralGetFrequencyLimit(key = "'bindTaoBao-'+#uid", time = 30)
 	@Async()
 	@Override
 	public void addBindTaoBao(Long uid) {
@@ -506,6 +509,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@IntegralGetFrequencyLimit(key = "'setWeiXinNum-'+#uid", time = 30)
 	@Async()
 	@Override
 	public void addSetWeiXinNum(Long uid) {
@@ -517,6 +521,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@IntegralGetFrequencyLimit(key = "'setGender-'+#uid", time = 30)
 	@Async()
 	@Override
 	public void addSetGender(Long uid) {
@@ -528,6 +533,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@IntegralGetFrequencyLimit(key = "'setPortrait-'+#uid", time = 30)
 	@Async()
 	@Override
 	public void addSetPortrait(Long uid) {
@@ -539,6 +545,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@IntegralGetFrequencyLimit(key = "'setNickName-'+#uid", time = 30)
 	@Async()
 	@Override
 	public void addSetNickname(Long uid) {
@@ -550,6 +557,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@IntegralGetFrequencyLimit(key = "'bindAlipay-'+#uid", time = 30)
 	@Async()
 	@Override
 	public void addBindAlipay(Long uid) {
@@ -561,6 +569,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@IntegralGetFrequencyLimit(key = "'inviteActivate-'+#uid", time = 30)
 	@Async()
 	@Override
 	public void addInviteActivate(Long uid) {

--
Gitblit v1.8.0