From a99de6e3ab8c984ad274f53ac350fa56548f2374 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 28 八月 2019 14:38:11 +0800
Subject: [PATCH] 自购立减/分享爆款返回数据修改修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java
index 7c8f541..a6e4ea7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java
@@ -8,6 +8,7 @@
 
 import javax.annotation.Resource;
 
+import org.springframework.context.annotation.Lazy;
 import org.springframework.core.task.TaskExecutor;
 import org.springframework.stereotype.Service;
 
@@ -80,6 +81,7 @@
 	@Resource
 	private UserOtherMsgNotificationService userOtherMsgNotificationService;
 	
+	@Lazy
 	@Resource
 	private IntegralGetService  integralGetService;
 	
@@ -117,8 +119,8 @@
 			throw new TokenRecordException(1, "鍙d护涓嶅瓨鍦�");
 
 		Long uidToken = rokenRecord.getUid();
-//		if (uid != null && uidToken != null && uid.longValue() == uidToken.longValue())
-//			throw new TokenRecordException(1, "涓嶈兘鑷繁璧犻�佺粰鑷繁");
+		if (uid != null && uidToken != null && uid.longValue() == uidToken.longValue())
+			throw new TokenRecordException(1, "涓嶈兘鑷繁璧犻�佺粰鑷繁");
 		
 		Date now = new Date();
 		Date endTimeToken = rokenRecord.getEndTime();
@@ -289,9 +291,9 @@
 		if (rokenRecord == null)
 			throw new TokenRecordException(1, "鍙d护宸插け鏁�");
 		
-//		Long uidToken = rokenRecord.getUid();
-//		if (uidToken != null && uid.longValue() == uidToken.longValue())
-//			throw new TokenRecordException(1, "涓嶈兘鑷繁璧犻�佺粰鑷繁");
+		Long uidToken = rokenRecord.getUid();
+		if (uidToken != null && uid.longValue() == uidToken.longValue())
+			throw new TokenRecordException(1, "涓嶈兘鑷繁璧犻�佺粰鑷繁");
 		
 		Date now = new Date();
 		Date endTimeToken = rokenRecord.getEndTime();

--
Gitblit v1.8.0