From bbe1a381f99d957d003f48b68dfd5bf0e401f5f0 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:27:25 +0800
Subject: [PATCH] 合并

---
 fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java |   34 +++++++++++++---------------------
 1 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java b/fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java
index 3d5bbb2..6167436 100644
--- a/fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java
+++ b/fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java
@@ -13,6 +13,7 @@
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
+import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.RedisManager;
 
 /**
@@ -21,9 +22,9 @@
  * @author Administrator
  *
  */
-@Component
-@Aspect
-@Order(6)
+//@Component
+//@Aspect
+//@Order(6)
 public class ActiveUserAspect {
 	
 	@Resource(name = "taskExecutor")
@@ -63,24 +64,15 @@
 					return;
 				}
 				
-				// 缂撳瓨uid鐨凨ey
-				String key = "activeUid_" + uuid;
-				
-				// 缂撳瓨涓槸鍚﹀瓨鍦╱id
-				String cacheValue = redisManager.getCommonString(key);
-				if (cacheValue != null && cacheValue.trim().length() > 0) {
-					return;
-				}
-
-				// 鍔犲叆缂撳瓨 20鍒嗛挓
-				redisManager.cacheCommonString("activeUid_" + uuid, uuid.toString(), 60 * 20);
-				
-				
-				// 鎺ユ敹鍒�
-				try {
-					userSystemCouponService.receivedCoupon(uuid);
-				} catch (Exception e) {
-					e.printStackTrace();
+				if (Constant.IS_OUTNET) {
+					String key = "activeUid_" + uuid;
+					// 缂撳瓨涓槸鍚﹀瓨鍦╱id
+					String cacheValue = redisManager.getCommonString(key);
+					if (cacheValue != null && cacheValue.trim().length() > 0) {
+						return;
+					}
+					// 鍔犲叆缂撳瓨 20鍒嗛挓
+					redisManager.cacheCommonString(key, uuid.toString(), 60 * 20);
 				}
 			}
 		});

--
Gitblit v1.8.0