From 2be98321c477b47f40bb3994b4d7634a2722f335 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 11:16:22 +0800
Subject: [PATCH] 领取金币

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralGetServiceImpl.java |  171 ++++++++++++++++++++++++++++-----------------------------
 1 files changed, 84 insertions(+), 87 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 44beb06..160003f 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
@@ -33,7 +33,7 @@
 
 	@Resource
 	private IntegralTaskRecordService integralTaskRecordService;
-	
+
 	@Resource
 	private ThreeSaleSerivce threeSaleSerivce;
 
@@ -46,6 +46,13 @@
 		IntegralTask task = integralTaskService.getByCidAndUniqueKey(null, event);
 		if (task == null)
 			throw new IntegralGetException(1, "浜嬩欢绫诲瀷涓嶅瓨鍦�");
+
+		if (TaskUniqueKeyEnum.inShop == TaskUniqueKeyEnum.valueOf(event)) {
+			UserInfo boss = threeSaleSerivce.getBoss(uid);
+			if (boss != null)
+				addInShopLevelOne(boss.getId()); // 涓嬬骇娴忚搴楅摵
+		}
+
 		if (task.getFrequency() == FrequencyEnum.everyday) {
 			int count = integralTaskRecordService.countGetCountByTaskIdAndDay(task.getId(), uid, nowDate);
 			if (count >= task.getUpperLimit())
@@ -68,19 +75,11 @@
 		record.setUid(uid);
 
 		try {
-			 IntegralTaskRecord addRecord = integralTaskRecordService.addRecord(record);
-			 if (TaskUniqueKeyEnum.inShop == TaskUniqueKeyEnum.valueOf(event)) {
-				 UserInfo boss = threeSaleSerivce.getBoss(uid);
-				 if (boss != null) 
-					 addInShopLevelOne(boss.getId()); // 涓嬬骇娴忚搴楅摵
-			 }
-			 return addRecord;
+			IntegralTaskRecord addRecord = integralTaskRecordService.addRecord(record);
+			return addRecord;
 		} catch (IntegralTaskRecordException e) {
 			throw new IntegralGetException(3, "娣诲姞璁板綍澶辫触");
 		}
-		
-		
-		
 
 		// switch (event) {
 		// case "recommendSearch":
@@ -123,21 +122,22 @@
 		// TODO Auto-generated method stub
 
 	}
-	
-	@IntegralGetVersionLimit(uid="#uid")
+
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Async()
 	private void addInShopLevelOne(Long uid) {
 		try {
-			addEventStatistic(uid, TaskUniqueKeyEnum.inShopLevelOne.name(), null);
 			UserInfo boss = threeSaleSerivce.getBoss(uid);
-			if (boss != null) 
+			if (boss != null)
 				addInShopLevelTwo(boss.getId()); // 浜岀骇闃熷憳
+
+			addEventStatistic(uid, TaskUniqueKeyEnum.inShopLevelOne.name(), null);
 		} catch (Exception e) {
 			LogHelper.errorDetailInfo(e);
 		}
 	}
-	
-	@IntegralGetVersionLimit(uid="#uid")
+
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Async()
 	private void addInShopLevelTwo(Long uid) {
 		try {
@@ -146,7 +146,6 @@
 			LogHelper.errorDetailInfo(e);
 		}
 	}
-	
 
 	@Override
 	public void addScanPushHistory(Long uid) throws IntegralGetException {
@@ -178,7 +177,7 @@
 
 	}
 
-	@IntegralGetVersionLimit(uid="#uid")
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Async()
 	@Override
 	public void addTaoLiJinBuy(Long uid, Long goodsId) {
@@ -189,25 +188,27 @@
 		}
 	}
 
-	@IntegralGetVersionLimit(uid="#uid")
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Async()
 	@Override
 	public void addInviteLevelOne(Long uid, Long workerId) {
 		try {
-			addEventStatistic(uid, TaskUniqueKeyEnum.inviteLevelOne.name(), null);
 			UserInfo boss = threeSaleSerivce.getBoss(uid);
 			if (boss != null)
 				addInviteLevelTwo(boss.getId());
+			
+			addEventStatistic(uid, TaskUniqueKeyEnum.inviteLevelOne.name(), null);
 		} catch (Exception e) {
 			LogHelper.errorDetailInfo(e);
 		}
 	}
-	
+
 	/**
 	 * 闂存帴閭�璇�
+	 * 
 	 * @param uid
 	 */
-	@IntegralGetVersionLimit(uid="#uid")
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Async()
 	private void addInviteLevelTwo(Long uid) {
 		try {
@@ -216,8 +217,8 @@
 			LogHelper.errorDetailInfo(e);
 		}
 	}
-	
-	@IntegralGetVersionLimit(uid="#uid")
+
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Async()
 	@Override
 	public void addShareSingleGoods(Long uid) {
@@ -227,9 +228,8 @@
 			LogHelper.errorDetailInfo(e);
 		}
 	}
-	
-	
-	@IntegralGetVersionLimit(uid="#uid")
+
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Async()
 	@Override
 	public void addShareMultipleGoods(Long uid) {
@@ -239,9 +239,8 @@
 			LogHelper.errorDetailInfo(e);
 		}
 	}
-	
-	
-	@IntegralGetVersionLimit(uid="#uid")
+
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Async()
 	@Override
 	public void addShareTLJGoods(Long uid) {
@@ -251,8 +250,8 @@
 			LogHelper.errorDetailInfo(e);
 		}
 	}
-	
-	@IntegralGetVersionLimit(uid="#uid")
+
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Async()
 	@Override
 	public void addGiveRebateCoupon(Long uid) {
@@ -262,8 +261,8 @@
 			LogHelper.errorDetailInfo(e);
 		}
 	}
-	
-	@IntegralGetVersionLimit(uid="#uid")
+
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Async()
 	@Override
 	public void addGiveFreeCoupon(Long uid) {
@@ -273,9 +272,8 @@
 			LogHelper.errorDetailInfo(e);
 		}
 	}
-	
-	
-	@IntegralGetVersionLimit(uid="#uid")
+
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Async()
 	@Override
 	public void addGiveTaoLiJin(Long uid) {
@@ -285,9 +283,8 @@
 			LogHelper.errorDetailInfo(e);
 		}
 	}
-	
-	
-	@IntegralGetVersionLimit(uid="#uid")
+
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Async()
 	@Override
 	public void addCloseRecommendGoods(Long uid) {
@@ -297,44 +294,47 @@
 			LogHelper.errorDetailInfo(e);
 		}
 	}
-	
-	@IntegralGetVersionLimit(uid="#uid")
+
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Async()
 	@Override
 	public void addCouponRebate(Long uid) {
 		try {
-			addEventStatistic(uid, TaskUniqueKeyEnum.couponRebate.name(), null);
 			UserInfo boss = threeSaleSerivce.getBoss(uid);
 			if (boss != null)
 				addCouponRebateLevelOne(boss.getId());
+			
+			addEventStatistic(uid, TaskUniqueKeyEnum.couponRebate.name(), null);
 		} catch (Exception e) {
 			LogHelper.errorDetailInfo(e);
 		}
 	}
-	
-	
+
 	/**
 	 * 涓�绾ч槦鍛橀鍒歌繑鍒�
+	 * 
 	 * @param uid
 	 */
-	@IntegralGetVersionLimit(uid="#uid")
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Async()
 	private void addCouponRebateLevelOne(Long uid) {
 		try {
-			addEventStatistic(uid, TaskUniqueKeyEnum.couponRebateLevelOne.name(), null);
 			UserInfo boss = threeSaleSerivce.getBoss(uid);
 			if (boss != null)
 				addCouponRebateLevelTwo(boss.getId()); // 浜岀骇闃熷憳
+			
+			addEventStatistic(uid, TaskUniqueKeyEnum.couponRebateLevelOne.name(), null);
 		} catch (Exception e) {
 			LogHelper.errorDetailInfo(e);
 		}
 	}
-	
+
 	/**
-	 *  浜岀骇闃熷憳棰嗗埜杩斿埄
+	 * 浜岀骇闃熷憳棰嗗埜杩斿埄
+	 * 
 	 * @param uid
 	 */
-	@IntegralGetVersionLimit(uid="#uid")
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Async()
 	private void addCouponRebateLevelTwo(Long uid) {
 		try {
@@ -343,45 +343,47 @@
 			LogHelper.errorDetailInfo(e);
 		}
 	}
-	
-	@IntegralGetVersionLimit(uid="#uid")
+
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Async()
 	@Override
 	public void addRebateOrder(Long uid) {
 		try {
-			addEventStatistic(uid, TaskUniqueKeyEnum.rebateOrder.name(), null);
 			UserInfo boss = threeSaleSerivce.getBoss(uid);
 			if (boss != null)
 				addInviteOrderLevelOne(boss.getId());
+			
+			addEventStatistic(uid, TaskUniqueKeyEnum.rebateOrder.name(), null);
 		} catch (Exception e) {
 			LogHelper.errorDetailInfo(e);
 		}
 	}
-	
-	
+
 	/**
 	 * 涓�绾ч槦鍛橀個璇疯鍗�
+	 * 
 	 * @param uid
 	 */
-	@IntegralGetVersionLimit(uid="#uid")
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Async()
 	private void addInviteOrderLevelOne(Long uid) {
 		try {
-			addEventStatistic(uid, TaskUniqueKeyEnum.inviteOrderLevelOne.name(), null);
 			UserInfo boss = threeSaleSerivce.getBoss(uid);
 			if (boss != null)
 				addInviteOrderLevelTwo(boss.getId());
+			
+			addEventStatistic(uid, TaskUniqueKeyEnum.inviteOrderLevelOne.name(), null);
 		} catch (Exception e) {
 			LogHelper.errorDetailInfo(e);
 		}
 	}
-	
-	
+
 	/**
 	 * 浜岀骇闃熷憳閭�璇疯鍗�
+	 * 
 	 * @param uid
 	 */
-	@IntegralGetVersionLimit(uid="#uid")
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Async()
 	private void addInviteOrderLevelTwo(Long uid) {
 		try {
@@ -390,8 +392,8 @@
 			LogHelper.errorDetailInfo(e);
 		}
 	}
-	
-	@IntegralGetVersionLimit(uid="#uid")
+
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Async()
 	@Override
 	public void addShareOrder(Long uid) {
@@ -401,9 +403,8 @@
 			LogHelper.errorDetailInfo(e);
 		}
 	}
-	
-	
-	@IntegralGetVersionLimit(uid="#uid")
+
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Async()
 	@Override
 	public void addBindWeiXin(Long uid) {
@@ -413,8 +414,8 @@
 			LogHelper.errorDetailInfo(e);
 		}
 	}
-	
-	@IntegralGetVersionLimit(uid="#uid")
+
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Async()
 	@Override
 	public void addBindPhone(Long uid) {
@@ -424,9 +425,8 @@
 			LogHelper.errorDetailInfo(e);
 		}
 	}
-	
-	
-	@IntegralGetVersionLimit(uid="#uid")
+
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Async()
 	@Override
 	public void addBindTaoBao(Long uid) {
@@ -436,8 +436,8 @@
 			LogHelper.errorDetailInfo(e);
 		}
 	}
-	
-	@IntegralGetVersionLimit(uid="#uid")
+
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Async()
 	@Override
 	public void addSetWeiXinNum(Long uid) {
@@ -447,8 +447,8 @@
 			LogHelper.errorDetailInfo(e);
 		}
 	}
-	
-	@IntegralGetVersionLimit(uid="#uid")
+
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Async()
 	@Override
 	public void addSetGender(Long uid) {
@@ -458,9 +458,8 @@
 			LogHelper.errorDetailInfo(e);
 		}
 	}
-	
-	
-	@IntegralGetVersionLimit(uid="#uid")
+
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Async()
 	@Override
 	public void addSetPortrait(Long uid) {
@@ -470,9 +469,8 @@
 			LogHelper.errorDetailInfo(e);
 		}
 	}
-	
-	
-	@IntegralGetVersionLimit(uid="#uid")
+
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Async()
 	@Override
 	public void addSetNickname(Long uid) {
@@ -482,9 +480,8 @@
 			LogHelper.errorDetailInfo(e);
 		}
 	}
-	
-	
-	@IntegralGetVersionLimit(uid="#uid")
+
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Async()
 	@Override
 	public void addBindAlipay(Long uid) {
@@ -494,8 +491,8 @@
 			LogHelper.errorDetailInfo(e);
 		}
 	}
-	
-	@IntegralGetVersionLimit(uid="#uid")
+
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Async()
 	@Override
 	public void addInviteActivate(Long uid) {
@@ -505,5 +502,5 @@
 			LogHelper.errorDetailInfo(e);
 		}
 	}
-	
+
 }

--
Gitblit v1.8.0