From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息

---
 fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 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 162e33e..fc389d2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java
+++ b/fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java
@@ -18,13 +18,17 @@
 import org.springframework.stereotype.Component;
 import org.yeshi.utils.NumberUtil;
 
+import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
+import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
 import com.yeshi.fanli.service.inter.user.UserInfoModifyRecordService;
+import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.ThreadUtil;
 import com.yeshi.fanli.util.annotation.UserActive;
 
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.params.SetParams;
 
 /**
  * 娲昏穬鐢ㄦ埛澶勭悊
@@ -40,6 +44,12 @@
 
 	@Resource
 	private UserInfoModifyRecordService userInfoModifyRecordService;
+
+	@Resource
+	private UserInfoExtraService userInfoExtraService;
+
+	@Resource
+	private IntegralGetService integralGetService;
 
 	private ExpressionParser parser = new SpelExpressionParser();
 
@@ -77,16 +87,19 @@
 							String key = "useractive-" + uidStr;
 							Jedis jedis = jedisPool.getResource();
 							try {
-								if (jedis.setnx(key, "1") > 0) {
-									jedis.expire(key, 60*5);// 5鍒嗛挓鍐呬笉澶勭悊
+								if (!StringUtil.isNullOrEmpty(jedis.set(key, "1", new SetParams().nx().ex(300)))) {
 									try {
 										// TODO 鐢ㄦ埛娲昏穬澶勭悊
-										userInfoModifyRecordService.syncBeforeInfo(Long.parseLong(uidStr));
+										Long uid = Long.parseLong(uidStr);
+										userInfoModifyRecordService.syncBeforeInfo(uid);
+										UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
+										if (extra != null && !StringUtil.isNullOrEmpty(extra.getInviteCode()))
+											integralGetService.addInviteActivate(uid);
 									} catch (Exception e) {
 									}
 								}
 							} finally {
-								jedisPool.returnResource(jedis);
+								jedis.close();
 							}
 						}
 					});

--
Gitblit v1.8.0