From f38e508d334ae03024f0dce0d1fb6baed212dc24 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 26 九月 2019 15:52:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralGetServiceImpl.java |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralGetServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralGetServiceImpl.java
index 8d3a0a4..427dbda 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralGetServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralGetServiceImpl.java
@@ -25,6 +25,8 @@
 import com.yeshi.fanli.service.inter.user.integral.IntegralTaskRecordService;
 import com.yeshi.fanli.service.inter.user.integral.IntegralTaskService;
 import com.yeshi.fanli.util.RedisManager;
+import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
+import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService;
 import com.yeshi.fanli.util.annotation.integral.IntegralGetFrequencyLimit;
 import com.yeshi.fanli.util.annotation.integral.IntegralGetVersionLimit;
 
@@ -50,12 +52,12 @@
 	@Resource
 	private IntegralTaskRankService integralTaskRankService;
 
-	// TODO 鏈塨ug
 	private UserInfo getBossByUid(Long uid) {
 		return threeSaleMapper.selectBoss(uid);
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid + '-' + #event")
 	@Override
 	public IntegralTaskRecord addEventStatistic(Long uid, String event) throws IntegralGetException {
 		Date nowDate = new Date();
@@ -257,6 +259,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addInviteLevelOne(Long uid, Long workerId) {
@@ -277,6 +280,7 @@
 	 * @param uid
 	 */
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	private void addInviteLevelTwo(Long uid) {
 		try {
@@ -323,6 +327,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addGiveRebateCoupon(Long uid) {
@@ -334,6 +339,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addGiveFreeCoupon(Long uid) {
@@ -345,6 +351,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addGiveTaoLiJin(Long uid) {
@@ -389,6 +396,7 @@
 	 * @param uid
 	 */
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	private void addCouponRebateLevelOne(Long uid) {
 		try {
@@ -408,6 +416,7 @@
 	 * @param uid
 	 */
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	private void addCouponRebateLevelTwo(Long uid) {
 		try {
@@ -418,6 +427,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addRebateOrder(Long uid) {
@@ -434,6 +444,7 @@
 	 * @param uid
 	 */
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addInviteOrderLevelOne(Long uid) {
@@ -450,6 +461,7 @@
 	 * @param uid
 	 */
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addInviteOrderLevelTwo(Long uid) {
@@ -461,6 +473,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addShareOrder(Long uid) {
@@ -472,6 +485,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addBindWeiXin(Long uid) {
@@ -483,6 +497,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addBindPhone(Long uid) {
@@ -494,6 +509,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addBindTaoBao(Long uid) {
@@ -505,6 +521,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addSetWeiXinNum(Long uid) {
@@ -516,6 +533,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addSetGender(Long uid) {
@@ -527,6 +545,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addSetPortrait(Long uid) {
@@ -538,6 +557,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addSetNickname(Long uid) {
@@ -549,6 +569,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addBindAlipay(Long uid) {
@@ -560,6 +581,7 @@
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addInviteActivate(Long uid) {

--
Gitblit v1.8.0