From d73ab2021def996f6c89f3a51c8fa1b5d65fe3b3 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 29 八月 2019 12:28:46 +0800
Subject: [PATCH] 奖励券跳转资金详情
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 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..19456c6 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();
@@ -329,11 +331,10 @@
if (userCoupon == null || userCoupon.getGive() == null || !userCoupon.getGive()
|| userCoupon.getState() != UserSystemCoupon.STATE_IN_USE)
throw new TokenRecordException(1, "璇ュ埜涓嶅瓨鍦ㄦ垨闈炶禒閫�");
-
-
+ UserSystemCoupon userSystemCoupon= null;
try {
- userSystemCouponService.insertUserCoupon(uid, CouponTypeEnum.freeCoupon.name(),
+ userSystemCoupon = userSystemCouponService.insertUserCoupon(uid, CouponTypeEnum.freeCoupon.name(),
UserSystemCoupon.SOURCE_GIVE, null);
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
@@ -360,9 +361,13 @@
// 鏇存柊璧犻�佽褰�
UserSystemCouponGiveRecord updateGiveRecord = new UserSystemCouponGiveRecord();
+ updateGiveRecord.setId(giveRecord.getId());
updateGiveRecord.setReceiveUid(uid);
updateGiveRecord.setReceiveTime(new Date());
updateGiveRecord.setState(UserSystemCouponGiveRecord.STATE_RECEIVE);
+ if (userSystemCoupon != null) {
+ updateGiveRecord.setReceiveId(userSystemCoupon.getId());
+ }
userSystemCouponGiveRecordService.updateByPrimaryKeySelective(updateGiveRecord);
integralGetService.addGiveFreeCoupon(giveUid);
@@ -417,8 +422,9 @@
if (systemCoupon == null)
throw new TokenRecordException(1, "璇ュ埜涓嶅瓨鍦�");
+ UserSystemCoupon userSystemCoupon= null;
try {
- userSystemCouponService.insertUserCoupon(uid, CouponTypeEnum.rebatePercentCoupon.name(),
+ userSystemCoupon = userSystemCouponService.insertUserCoupon(uid, CouponTypeEnum.rebatePercentCoupon.name(),
UserSystemCoupon.SOURCE_GIVE, systemCoupon.getPercent());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
@@ -445,9 +451,13 @@
// 鏇存柊璧犻�佽褰�
UserSystemCouponGiveRecord updateGiveRecord = new UserSystemCouponGiveRecord();
+ updateGiveRecord.setId(giveRecord.getId());
updateGiveRecord.setReceiveUid(uid);
updateGiveRecord.setReceiveTime(new Date());
updateGiveRecord.setState(UserSystemCouponGiveRecord.STATE_RECEIVE);
+ if (userSystemCoupon != null) {
+ updateGiveRecord.setReceiveId(userSystemCoupon.getId());
+ }
userSystemCouponGiveRecordService.updateByPrimaryKeySelective(updateGiveRecord);
integralGetService.addGiveRebateCoupon(giveUid);
@@ -472,7 +482,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 +534,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