From e6764831a890de26fcfebb4fb8f3a22e9f8cc816 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 16:09:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java | 9 +++------
1 files changed, 3 insertions(+), 6 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..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;
@@ -417,14 +419,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