From 0f9a0a76b170bceac867dd5cd009e518ac6646e4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 20 十一月 2019 11:04:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralGetServiceImpl.java |  108 +++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 70 insertions(+), 38 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 427dbda..6781527 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
@@ -7,6 +7,7 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.yeshi.fanli.dao.mybatis.ThreeSaleMapper;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -17,6 +18,7 @@
 import com.yeshi.fanli.entity.integral.IntegralTask.TaskUniqueKeyEnum;
 import com.yeshi.fanli.entity.integral.IntegralTaskRank;
 import com.yeshi.fanli.entity.integral.IntegralTaskRecord;
+import com.yeshi.fanli.entity.integral.UserGetIntegralFromOrderRecord;
 import com.yeshi.fanli.exception.integral.IntegralGetException;
 import com.yeshi.fanli.exception.integral.IntegralTaskRecordException;
 import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
@@ -24,11 +26,12 @@
 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.service.inter.user.integral.UserGetIntegralFromOrderRecordService;
 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;
+import com.yeshi.fanli.util.factory.integral.UserGetIntegralFromOrderRecordFactory;
 
 @Lazy
 @Service
@@ -51,6 +54,9 @@
 
 	@Resource
 	private IntegralTaskRankService integralTaskRankService;
+
+	@Resource
+	private UserGetIntegralFromOrderRecordService userGetIntegralFromOrderRecordService;
 
 	private UserInfo getBossByUid(Long uid) {
 		return threeSaleMapper.selectBoss(uid);
@@ -143,7 +149,7 @@
 
 		return null;
 	}
-	
+
 	@IntegralGetFrequencyLimit(key = "'addShareInvite-'+#uid", time = 30)
 	@Override
 	public IntegralTaskRecord addShareInvite(Long uid) {
@@ -176,7 +182,7 @@
 
 			addEventStatistic(uid, TaskUniqueKeyEnum.inShopLevelOne.name());
 		} catch (Exception e) {
-			//LogHelper.errorDetailInfo(e);
+			// LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -186,7 +192,7 @@
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.inShopLevelTwo.name());
 		} catch (Exception e) {
-			//LogHelper.errorDetailInfo(e);
+			// LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -254,7 +260,7 @@
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.taoLiJinBuy.name());
 		} catch (Exception e) {
-			//LogHelper.errorDetailInfo(e);
+			// LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -270,7 +276,7 @@
 
 			addEventStatistic(uid, TaskUniqueKeyEnum.inviteLevelOne.name());
 		} catch (Exception e) {
-			//LogHelper.errorDetailInfo(e);
+			// LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -286,7 +292,7 @@
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.inviteLevelTwo.name());
 		} catch (Exception e) {
-			//LogHelper.errorDetailInfo(e);
+			// LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -298,7 +304,7 @@
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.shareSingleGoods.name());
 		} catch (Exception e) {
-			//LogHelper.errorDetailInfo(e);
+			// LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -310,7 +316,7 @@
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.shareMultipleGoods.name());
 		} catch (Exception e) {
-			//LogHelper.errorDetailInfo(e);
+			// LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -322,7 +328,7 @@
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.shareTLJGoods.name());
 		} catch (Exception e) {
-			//LogHelper.errorDetailInfo(e);
+			// LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -334,7 +340,7 @@
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.giveRebateCoupon.name());
 		} catch (Exception e) {
-			//LogHelper.errorDetailInfo(e);
+			// LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -346,7 +352,7 @@
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.giveFreeCoupon.name());
 		} catch (Exception e) {
-			//LogHelper.errorDetailInfo(e);
+			// LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -358,7 +364,7 @@
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.giveTaoLiJin.name());
 		} catch (Exception e) {
-			//LogHelper.errorDetailInfo(e);
+			// LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -370,7 +376,7 @@
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.closeRecommendGoods.name());
 		} catch (Exception e) {
-			//LogHelper.errorDetailInfo(e);
+			// LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -386,7 +392,7 @@
 
 			addEventStatistic(uid, TaskUniqueKeyEnum.couponRebate.name());
 		} catch (Exception e) {
-			//LogHelper.errorDetailInfo(e);
+			// LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -406,7 +412,7 @@
 
 			addEventStatistic(uid, TaskUniqueKeyEnum.couponRebateLevelOne.name());
 		} catch (Exception e) {
-			//LogHelper.errorDetailInfo(e);
+			// LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -422,19 +428,25 @@
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.couponRebateLevelTwo.name());
 		} catch (Exception e) {
-			//LogHelper.errorDetailInfo(e);
+			// LogHelper.errorDetailInfo(e);
 		}
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
 	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
+	@Transactional
 	@Override
-	public void addRebateOrder(Long uid) {
+	public void addRebateOrder(Long uid, String orderNo, int sourceType) {
 		try {
-			addEventStatistic(uid, TaskUniqueKeyEnum.rebateOrder.name());
+			IntegralTaskRecord record = addEventStatistic(uid, TaskUniqueKeyEnum.rebateOrder.name());
+			if (record != null) {
+				userGetIntegralFromOrderRecordService.addRecord(
+						UserGetIntegralFromOrderRecordFactory.create(UserGetIntegralFromOrderRecord.TYPE_RECIEVE_MONEY,
+								uid, orderNo, sourceType, record.getGoldCoin()));
+			}
 		} catch (Exception e) {
-			//LogHelper.errorDetailInfo(e);
+			// LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -446,12 +458,19 @@
 	@IntegralGetVersionLimit(uid = "#uid")
 	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
+	@Transactional
 	@Override
-	public void addInviteOrderLevelOne(Long uid) {
+	public void addInviteOrderLevelOne(Long uid, String orderNo, int sourceType) {
 		try {
-			addEventStatistic(uid, TaskUniqueKeyEnum.inviteOrderLevelOne.name());
+			IntegralTaskRecord record = addEventStatistic(uid, TaskUniqueKeyEnum.inviteOrderLevelOne.name());
+			if (record != null) {
+				userGetIntegralFromOrderRecordService.addRecord(
+						UserGetIntegralFromOrderRecordFactory.create(UserGetIntegralFromOrderRecord.TYPE_RECIEVE_MONEY,
+								uid, orderNo, sourceType, record.getGoldCoin()));
+			}
+
 		} catch (Exception e) {
-			//LogHelper.errorDetailInfo(e);
+			// LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -463,24 +482,37 @@
 	@IntegralGetVersionLimit(uid = "#uid")
 	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
+	@Transactional
 	@Override
-	public void addInviteOrderLevelTwo(Long uid) {
+	public void addInviteOrderLevelTwo(Long uid, String orderNo, int sourceType) {
 		try {
-			addEventStatistic(uid, TaskUniqueKeyEnum.inviteOrderLevelTwo.name());
+			IntegralTaskRecord record = addEventStatistic(uid, TaskUniqueKeyEnum.inviteOrderLevelTwo.name());
+			if (record != null) {
+				userGetIntegralFromOrderRecordService.addRecord(
+						UserGetIntegralFromOrderRecordFactory.create(UserGetIntegralFromOrderRecord.TYPE_RECIEVE_MONEY,
+								uid, orderNo, sourceType, record.getGoldCoin()));
+			}
+
 		} catch (Exception e) {
-			//LogHelper.errorDetailInfo(e);
+			// LogHelper.errorDetailInfo(e);
 		}
 	}
 
 	@IntegralGetVersionLimit(uid = "#uid")
 	@RequestSerializableByKeyService(key = "#uid")
 	@Async()
+	@Transactional
 	@Override
-	public void addShareOrder(Long uid) {
+	public void addShareOrder(Long uid, String orderNo, int sourceType) {
 		try {
-			addEventStatistic(uid, TaskUniqueKeyEnum.shareOrder.name());
+			IntegralTaskRecord record = addEventStatistic(uid, TaskUniqueKeyEnum.shareOrder.name());
+			if (record != null) {
+				userGetIntegralFromOrderRecordService.addRecord(
+						UserGetIntegralFromOrderRecordFactory.create(UserGetIntegralFromOrderRecord.TYPE_RECIEVE_MONEY,
+								uid, orderNo, sourceType, record.getGoldCoin()));
+			}
 		} catch (Exception e) {
-			//LogHelper.errorDetailInfo(e);
+			// LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -492,7 +524,7 @@
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.bindWeiXin.name());
 		} catch (Exception e) {
-			//LogHelper.errorDetailInfo(e);
+			// LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -504,7 +536,7 @@
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.bindPhone.name());
 		} catch (Exception e) {
-			//LogHelper.errorDetailInfo(e);
+			// LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -516,7 +548,7 @@
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.bindTaoBao.name());
 		} catch (Exception e) {
-			//LogHelper.errorDetailInfo(e);
+			// LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -528,7 +560,7 @@
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.setWeiXinNum.name());
 		} catch (Exception e) {
-			//LogHelper.errorDetailInfo(e);
+			// LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -540,7 +572,7 @@
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.setGender.name());
 		} catch (Exception e) {
-			//LogHelper.errorDetailInfo(e);
+			// LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -552,7 +584,7 @@
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.setPortrait.name());
 		} catch (Exception e) {
-			//LogHelper.errorDetailInfo(e);
+			// LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -564,7 +596,7 @@
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.setNickName.name());
 		} catch (Exception e) {
-			//LogHelper.errorDetailInfo(e);
+			// LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -576,7 +608,7 @@
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.bindAlipay.name());
 		} catch (Exception e) {
-			//LogHelper.errorDetailInfo(e);
+			// LogHelper.errorDetailInfo(e);
 		}
 	}
 
@@ -588,7 +620,7 @@
 		try {
 			addEventStatistic(uid, TaskUniqueKeyEnum.inviteActivate.name());
 		} catch (Exception e) {
-			//LogHelper.errorDetailInfo(e);
+			// LogHelper.errorDetailInfo(e);
 		}
 	}
 

--
Gitblit v1.8.0