From 788deca1b4a24f8a24e49c24f7d89975a1d74bbe Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期日, 03 十一月 2019 23:31:25 +0800
Subject: [PATCH] 商城订单退款处理

---
 fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java |   36 ++++++++++++++++++++++++++----------
 1 files changed, 26 insertions(+), 10 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 660e2f9..a953c73 100644
--- a/fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java
+++ b/fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java
@@ -4,8 +4,9 @@
 
 import javax.annotation.Resource;
 
-import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.Signature;
+import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.core.DefaultParameterNameDiscoverer;
@@ -14,8 +15,13 @@
 import org.springframework.expression.ExpressionParser;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
+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;
@@ -29,19 +35,26 @@
  * @author Administrator
  *
  */
-// @Component
-// @Aspect
-// @Order(6)
+@Component
+@Aspect
 public class ActiveUserAspect {
-
 	@Resource
 	private JedisPool jedisPool;
+
+	@Resource
+	private UserInfoModifyRecordService userInfoModifyRecordService;
+
+	@Resource
+	private UserInfoExtraService userInfoExtraService;
+
+	@Resource
+	private IntegralGetService integralGetService;
 
 	private ExpressionParser parser = new SpelExpressionParser();
 
 	private DefaultParameterNameDiscoverer nameDiscoverer = new DefaultParameterNameDiscoverer();
 
-	public String generateKeyBySpEL(String spELString, ProceedingJoinPoint joinPoint) {
+	public String generateKeyBySpEL(String spELString, JoinPoint joinPoint) {
 		MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
 		String[] paramNames = nameDiscoverer.getParameterNames(methodSignature.getMethod());
 		Expression expression = parser.parseExpression(spELString);
@@ -56,7 +69,7 @@
 	public static final String EDP = "execution(* com.yeshi.fanli.controller.client.*.*.*(..))";
 
 	@Before(EDP)
-	public void activeBefore(ProceedingJoinPoint joinPoint) {
+	public void activeBefore(JoinPoint joinPoint) {
 		try {
 			Signature signature = joinPoint.getSignature();
 			MethodSignature methodSignature = (MethodSignature) signature;
@@ -73,12 +86,15 @@
 							String key = "useractive-" + uidStr;
 							Jedis jedis = jedisPool.getResource();
 							try {
-
 								if (jedis.setnx(key, "1") > 0) {
-									jedis.expire(key, 60);// 60s鍐呬笉澶勭悊
+									jedis.expire(key, 60 * 5);// 5鍒嗛挓鍐呬笉澶勭悊
 									try {
 										// TODO 鐢ㄦ埛娲昏穬澶勭悊
-
+										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) {
 									}
 								}

--
Gitblit v1.8.0