From da36dbefcd945cc85d170c5c2e78682d13497f97 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 26 八月 2019 17:46:24 +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 |   35 ++++++++++++++++++++++++++++++-----
 1 files changed, 30 insertions(+), 5 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 f14c15b..44beb06 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
@@ -21,6 +21,7 @@
 import com.yeshi.fanli.service.inter.integral.IntegralTaskRecordService;
 import com.yeshi.fanli.service.inter.integral.IntegralTaskService;
 import com.yeshi.fanli.util.RedisManager;
+import com.yeshi.fanli.util.annotation.integral.IntegralGetVersionLimit;
 
 import net.sf.json.JSONObject;
 
@@ -123,6 +124,7 @@
 
 	}
 	
+	@IntegralGetVersionLimit(uid="#uid")
 	@Async()
 	private void addInShopLevelOne(Long uid) {
 		try {
@@ -135,6 +137,7 @@
 		}
 	}
 	
+	@IntegralGetVersionLimit(uid="#uid")
 	@Async()
 	private void addInShopLevelTwo(Long uid) {
 		try {
@@ -175,6 +178,7 @@
 
 	}
 
+	@IntegralGetVersionLimit(uid="#uid")
 	@Async()
 	@Override
 	public void addTaoLiJinBuy(Long uid, Long goodsId) {
@@ -185,6 +189,7 @@
 		}
 	}
 
+	@IntegralGetVersionLimit(uid="#uid")
 	@Async()
 	@Override
 	public void addInviteLevelOne(Long uid, Long workerId) {
@@ -202,6 +207,7 @@
 	 * 闂存帴閭�璇�
 	 * @param uid
 	 */
+	@IntegralGetVersionLimit(uid="#uid")
 	@Async()
 	private void addInviteLevelTwo(Long uid) {
 		try {
@@ -211,6 +217,7 @@
 		}
 	}
 	
+	@IntegralGetVersionLimit(uid="#uid")
 	@Async()
 	@Override
 	public void addShareSingleGoods(Long uid) {
@@ -222,6 +229,7 @@
 	}
 	
 	
+	@IntegralGetVersionLimit(uid="#uid")
 	@Async()
 	@Override
 	public void addShareMultipleGoods(Long uid) {
@@ -233,6 +241,7 @@
 	}
 	
 	
+	@IntegralGetVersionLimit(uid="#uid")
 	@Async()
 	@Override
 	public void addShareTLJGoods(Long uid) {
@@ -243,6 +252,7 @@
 		}
 	}
 	
+	@IntegralGetVersionLimit(uid="#uid")
 	@Async()
 	@Override
 	public void addGiveRebateCoupon(Long uid) {
@@ -253,7 +263,7 @@
 		}
 	}
 	
-	
+	@IntegralGetVersionLimit(uid="#uid")
 	@Async()
 	@Override
 	public void addGiveFreeCoupon(Long uid) {
@@ -265,6 +275,7 @@
 	}
 	
 	
+	@IntegralGetVersionLimit(uid="#uid")
 	@Async()
 	@Override
 	public void addGiveTaoLiJin(Long uid) {
@@ -276,6 +287,7 @@
 	}
 	
 	
+	@IntegralGetVersionLimit(uid="#uid")
 	@Async()
 	@Override
 	public void addCloseRecommendGoods(Long uid) {
@@ -286,7 +298,7 @@
 		}
 	}
 	
-	
+	@IntegralGetVersionLimit(uid="#uid")
 	@Async()
 	@Override
 	public void addCouponRebate(Long uid) {
@@ -305,6 +317,7 @@
 	 * 涓�绾ч槦鍛橀鍒歌繑鍒�
 	 * @param uid
 	 */
+	@IntegralGetVersionLimit(uid="#uid")
 	@Async()
 	private void addCouponRebateLevelOne(Long uid) {
 		try {
@@ -321,6 +334,7 @@
 	 *  浜岀骇闃熷憳棰嗗埜杩斿埄
 	 * @param uid
 	 */
+	@IntegralGetVersionLimit(uid="#uid")
 	@Async()
 	private void addCouponRebateLevelTwo(Long uid) {
 		try {
@@ -330,6 +344,7 @@
 		}
 	}
 	
+	@IntegralGetVersionLimit(uid="#uid")
 	@Async()
 	@Override
 	public void addRebateOrder(Long uid) {
@@ -348,6 +363,7 @@
 	 * 涓�绾ч槦鍛橀個璇疯鍗�
 	 * @param uid
 	 */
+	@IntegralGetVersionLimit(uid="#uid")
 	@Async()
 	private void addInviteOrderLevelOne(Long uid) {
 		try {
@@ -365,6 +381,7 @@
 	 * 浜岀骇闃熷憳閭�璇疯鍗�
 	 * @param uid
 	 */
+	@IntegralGetVersionLimit(uid="#uid")
 	@Async()
 	private void addInviteOrderLevelTwo(Long uid) {
 		try {
@@ -374,6 +391,7 @@
 		}
 	}
 	
+	@IntegralGetVersionLimit(uid="#uid")
 	@Async()
 	@Override
 	public void addShareOrder(Long uid) {
@@ -385,6 +403,7 @@
 	}
 	
 	
+	@IntegralGetVersionLimit(uid="#uid")
 	@Async()
 	@Override
 	public void addBindWeiXin(Long uid) {
@@ -395,6 +414,7 @@
 		}
 	}
 	
+	@IntegralGetVersionLimit(uid="#uid")
 	@Async()
 	@Override
 	public void addBindPhone(Long uid) {
@@ -406,6 +426,7 @@
 	}
 	
 	
+	@IntegralGetVersionLimit(uid="#uid")
 	@Async()
 	@Override
 	public void addBindTaoBao(Long uid) {
@@ -416,7 +437,7 @@
 		}
 	}
 	
-	
+	@IntegralGetVersionLimit(uid="#uid")
 	@Async()
 	@Override
 	public void addSetWeiXinNum(Long uid) {
@@ -427,6 +448,7 @@
 		}
 	}
 	
+	@IntegralGetVersionLimit(uid="#uid")
 	@Async()
 	@Override
 	public void addSetGender(Long uid) {
@@ -438,6 +460,7 @@
 	}
 	
 	
+	@IntegralGetVersionLimit(uid="#uid")
 	@Async()
 	@Override
 	public void addSetPortrait(Long uid) {
@@ -449,17 +472,19 @@
 	}
 	
 	
+	@IntegralGetVersionLimit(uid="#uid")
 	@Async()
 	@Override
 	public void addSetNickname(Long uid) {
 		try {
-			addEventStatistic(uid, TaskUniqueKeyEnum.setNickname.name(), null);
+			addEventStatistic(uid, TaskUniqueKeyEnum.setNickName.name(), null);
 		} catch (Exception e) {
 			LogHelper.errorDetailInfo(e);
 		}
 	}
 	
 	
+	@IntegralGetVersionLimit(uid="#uid")
 	@Async()
 	@Override
 	public void addBindAlipay(Long uid) {
@@ -470,7 +495,7 @@
 		}
 	}
 	
-	
+	@IntegralGetVersionLimit(uid="#uid")
 	@Async()
 	@Override
 	public void addInviteActivate(Long uid) {

--
Gitblit v1.8.0