From 74be2e325a3bc4dbe95e9825c18574e1102877c5 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 15:08:54 +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 |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 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 e78a478..692abf9 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
@@ -4,7 +4,6 @@
 
 import javax.annotation.Resource;
 
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -22,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.IntegralGetFrequencyLimit;
 import com.yeshi.fanli.util.annotation.integral.IntegralGetVersionLimit;
 
 @Lazy
@@ -45,7 +45,7 @@
 		return threeSaleMapper.selectBoss(uid);
 	}
 
-	@IntegralGetVersionLimit(uid="#uid")
+	@IntegralGetVersionLimit(uid = "#uid")
 	@Override
 	public IntegralTaskRecord addEventStatistic(Long uid, String event) throws IntegralGetException {
 		Date nowDate = new Date();
@@ -88,7 +88,7 @@
 		}
 	}
 
-	@Cacheable(value = "integralGetCache", key = "'addRecommendSearch-'+#uid")
+	@IntegralGetFrequencyLimit(key = "'addRecommendSearch-'+#uid")
 	@Override
 	public IntegralTaskRecord addRecommendSearch(Long uid) {
 		try {
@@ -99,7 +99,7 @@
 		return null;
 	}
 
-	@Cacheable(value = "integralGetCache", key = "'addSearchResultScan-'+#uid+'-'+#kw")
+	@IntegralGetFrequencyLimit(key = "'addSearchResultScan-'+#uid+'-'+#kw")
 	@Override
 	public IntegralTaskRecord addSearchResultScan(Long uid, String kw) {
 		try {
@@ -111,7 +111,7 @@
 		return null;
 	}
 
-	@Cacheable(value = "integralGetCache", key = "'addShareInvite-'+#uid")
+	@IntegralGetFrequencyLimit(key = "'addShareInvite-'+#uid")
 	@Override
 	public IntegralTaskRecord addShareInvite(Long uid) {
 		try {
@@ -122,7 +122,7 @@
 		return null;
 	}
 
-	@Cacheable(value = "integralGetCache", key = "'addIntoShop-'+#uid+'-'+#shopUrlMD5")
+	@IntegralGetFrequencyLimit(key = "'addIntoShop-'+#uid+'-'+#shopUrlMD5")
 	@Override
 	public IntegralTaskRecord addIntoShop(Long uid, String shopUrlMD5) {
 		try {
@@ -157,7 +157,7 @@
 		}
 	}
 
-	@Cacheable(value = "integralGetCache", key = "'addScanPushHistory-'+#uid")
+	@IntegralGetFrequencyLimit(key = "'addScanPushHistory-'+#uid")
 	@Override
 	public IntegralTaskRecord addScanPushHistory(Long uid) {
 		try {
@@ -168,7 +168,7 @@
 		return null;
 	}
 
-	@Cacheable(value = "integralGetCache", key = "'addScanGoodsDetail-'+#uid+'-'+#goodsType+'-'+#goodsId")
+	@IntegralGetFrequencyLimit(key = "'addScanGoodsDetail-'+#uid+'-'+#goodsType+'-'+#goodsId")
 	@Override
 	public IntegralTaskRecord addScanGoodsDetail(Long uid, int goodsType, Long goodsId) {
 		try {
@@ -179,7 +179,7 @@
 		return null;
 	}
 
-	@Cacheable(value = "integralGetCache", key = "'addScanRecommendBanner-'+#uid+'-'+#id")
+	@IntegralGetFrequencyLimit(key = "'addScanRecommendBanner-'+#uid+'-'+#id")
 	@Override
 	public IntegralTaskRecord addScanRecommendBanner(Long uid, String id) {
 		try {
@@ -190,7 +190,7 @@
 		return null;
 	}
 
-	@Cacheable(value = "integralGetCache", key = "'addScanRecommendSpecial-'+#uid+'-'+#id")
+	@IntegralGetFrequencyLimit(key = "'addScanRecommendSpecial-'+#uid+'-'+#id")
 	@Override
 	public IntegralTaskRecord addScanRecommendSpecial(Long uid, String id) {
 		try {
@@ -202,7 +202,7 @@
 		return null;
 	}
 
-	@Cacheable(value = "integralGetCache", key = "'addScanTaoBaoCart-'+#uid")
+	@IntegralGetFrequencyLimit(key = "'addScanTaoBaoCart-'+#uid")
 	@Override
 	public IntegralTaskRecord addScanTaoBaoCart(Long uid) {
 		try {

--
Gitblit v1.8.0