From 4f0197ad8aeb2dd13929d2f656d80265263775ed Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 17:26:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java | 17 ++++++-----------
1 files changed, 6 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 f0086bf..7c8f541 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
@@ -117,8 +117,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 +289,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();
@@ -417,14 +417,9 @@
if (systemCoupon == null)
throw new TokenRecordException(1, "璇ュ埜涓嶅瓨鍦�");
- BigDecimal percent = null;
- String amount = systemCoupon.getAmount();
- if (!StringUtil.isNullOrEmpty(amount))
- percent = new BigDecimal(amount);
-
try {
userSystemCouponService.insertUserCoupon(uid, CouponTypeEnum.rebatePercentCoupon.name(),
- UserSystemCoupon.SOURCE_GIVE, percent);
+ UserSystemCoupon.SOURCE_GIVE, systemCoupon.getPercent());
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
throw new TokenRecordException(1, "棰嗗彇澶辫触");
--
Gitblit v1.8.0