From 5fef7a807a1efe885ad5b8f27c61f662e02a8c04 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 26 九月 2019 11:58:33 +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/user/integral/IntegralGetServiceImpl.java |   81 +++++++++++++++++++++++++---------------
 1 files changed, 51 insertions(+), 30 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 c776427..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
@@ -19,13 +19,14 @@
 import com.yeshi.fanli.entity.integral.IntegralTaskRecord;
 import com.yeshi.fanli.exception.integral.IntegralGetException;
 import com.yeshi.fanli.exception.integral.IntegralTaskRecordException;
-import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
 import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;
 import com.yeshi.fanli.service.inter.user.integral.IntegralTaskRankService;
 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;
 
@@ -51,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();
@@ -175,7 +176,7 @@
 
 			addEventStatistic(uid, TaskUniqueKeyEnum.inShopLevelOne.name());
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			//LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -185,7 +186,7 @@
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.inShopLevelTwo.name());
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			//LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -253,11 +254,12 @@
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.taoLiJinBuy.name());
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			//LogHelper.errorDetailInfo(e);
 		}
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addInviteLevelOne(Long uid, Long workerId) {
@@ -268,7 +270,7 @@
 
 			addEventStatistic(uid, TaskUniqueKeyEnum.inviteLevelOne.name());
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			//LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -278,12 +280,13 @@
 	 * @param uid
 	 */
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	private void addInviteLevelTwo(Long uid) {
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.inviteLevelTwo.name());
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			//LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -295,7 +298,7 @@
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.shareSingleGoods.name());
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			//LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -307,7 +310,7 @@
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.shareMultipleGoods.name());
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			//LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -319,40 +322,43 @@
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.shareTLJGoods.name());
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			//LogHelper.errorDetailInfo(e);
 		}
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addGiveRebateCoupon(Long uid) {
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.giveRebateCoupon.name());
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			//LogHelper.errorDetailInfo(e);
 		}
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addGiveFreeCoupon(Long uid) {
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.giveFreeCoupon.name());
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			//LogHelper.errorDetailInfo(e);
 		}
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addGiveTaoLiJin(Long uid) {
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.giveTaoLiJin.name());
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			//LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -364,7 +370,7 @@
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.closeRecommendGoods.name());
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			//LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -380,7 +386,7 @@
 
 			addEventStatistic(uid, TaskUniqueKeyEnum.couponRebate.name());
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			//LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -390,6 +396,7 @@
 	 * @param uid
 	 */
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	private void addCouponRebateLevelOne(Long uid) {
 		try {
@@ -399,7 +406,7 @@
 
 			addEventStatistic(uid, TaskUniqueKeyEnum.couponRebateLevelOne.name());
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			//LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -409,23 +416,25 @@
 	 * @param uid
 	 */
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	private void addCouponRebateLevelTwo(Long uid) {
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.couponRebateLevelTwo.name());
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			//LogHelper.errorDetailInfo(e);
 		}
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addRebateOrder(Long uid) {
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.rebateOrder.name());
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			//LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -435,13 +444,14 @@
 	 * @param uid
 	 */
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addInviteOrderLevelOne(Long uid) {
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.inviteOrderLevelOne.name());
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			//LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -451,123 +461,134 @@
 	 * @param uid
 	 */
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addInviteOrderLevelTwo(Long uid) {
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.inviteOrderLevelTwo.name());
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			//LogHelper.errorDetailInfo(e);
 		}
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addShareOrder(Long uid) {
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.shareOrder.name());
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			//LogHelper.errorDetailInfo(e);
 		}
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addBindWeiXin(Long uid) {
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.bindWeiXin.name());
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			//LogHelper.errorDetailInfo(e);
 		}
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addBindPhone(Long uid) {
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.bindPhone.name());
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			//LogHelper.errorDetailInfo(e);
 		}
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addBindTaoBao(Long uid) {
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.bindTaoBao.name());
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			//LogHelper.errorDetailInfo(e);
 		}
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addSetWeiXinNum(Long uid) {
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.setWeiXinNum.name());
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			//LogHelper.errorDetailInfo(e);
 		}
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addSetGender(Long uid) {
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.setGender.name());
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			//LogHelper.errorDetailInfo(e);
 		}
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addSetPortrait(Long uid) {
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.setPortrait.name());
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			//LogHelper.errorDetailInfo(e);
 		}
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addSetNickname(Long uid) {
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.setNickName.name());
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			//LogHelper.errorDetailInfo(e);
 		}
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addBindAlipay(Long uid) {
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.bindAlipay.name());
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			//LogHelper.errorDetailInfo(e);
 		}
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
+	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
 	@Override
 	public void addInviteActivate(Long uid) {
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.inviteActivate.name());
 		} catch (Exception e) {
-			LogHelper.errorDetailInfo(e);
+			//LogHelper.errorDetailInfo(e);
 		}
 	}
 

--
Gitblit v1.8.0