From 89cc3286104f6ceaf664fa23647be40a84fcd2c4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 28 八月 2019 17:04:35 +0800
Subject: [PATCH] ios 版本1.65改为65
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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..b7aa3f6 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, "鍙ｄ护涓嶅瓨鍦�");
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, "鍙ｄ护宸插け鏁�");
-// 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();
@@ -472,7 +474,7 @@
msgOther.setType(MsgOtherGiveContentDTO.TYEP_COUPON);
msgOther.setTitle("璧犻�佸鍔卞埜");
msgOther.setGiveType("浣犺禒閫佺殑濂栧姳鍒歌鎴愬姛棰嗗彇");
- msgOther.setReceiveInfo("鏄电О: " + userName + " ID:" + uid);
+ msgOther.setReceiveInfo("鏄电О锛� " + userName + " ID锛�" + uid);
msgOther.setGiveTime(sd.format(giveRecord.getGiveTime()));
msgOther.setReceiveTime(sd.format(new Date()));
userOtherMsgNotificationService.tokenGiveMsg(giveUid, beiZhu, msgOther);
@@ -524,7 +526,7 @@
msgOther.setType(MsgOtherGiveContentDTO.TYEP_TLJ);
msgOther.setTitle("璧犻�佹帹骞跨孩鍖�");
msgOther.setGiveType("浣犺禒閫佺殑鎺ㄥ箍绾㈠寘琚垚鍔熼鍙�");
- msgOther.setReceiveInfo("鏄电О: " + userName + " ID:" + uid);
+ msgOther.setReceiveInfo("鏄电О锛�" + userName + " ID锛�" + uid);
msgOther.setGiveTime(sd.format(giveRecord.getGiveTime()));
msgOther.setReceiveTime(sd.format(new Date()));
userOtherMsgNotificationService.tokenGiveMsg(giveUid, beiZhu, msgOther);
--
Gitblit v1.8.0