From be641cbe14bf20c807dccceb1c4b825d80443aed Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 08 一月 2020 14:42:47 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralExchangeServiceImpl.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralExchangeServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralExchangeServiceImpl.java index ea2751c..a54f30b 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralExchangeServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralExchangeServiceImpl.java @@ -20,6 +20,7 @@ import com.yeshi.fanli.entity.integral.IntegralExchange; import com.yeshi.fanli.entity.integral.IntegralExchange.ExchangeTypeEnum; import com.yeshi.fanli.entity.money.UserMoneyDetail; +import com.yeshi.fanli.entity.system.ConfigKeyEnum; import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum; import com.yeshi.fanli.exception.integral.IntegralExchangeException; import com.yeshi.fanli.log.LogHelper; @@ -259,7 +260,7 @@ } else if (ExchangeTypeEnum.rebatePercentCoupon == type) { thing = "杩斿埄濂栧姳鍒�"; thingNum = "1寮�"; - String percent = configService.get("exchange_rebate_percent"); + String percent = configService.get(ConfigKeyEnum.exchangeRebatePercent.getKey()); userSystemCouponService.exchangeCoupon(uid, CouponTypeEnum.rebatePercentCoupon.name(), UserSystemCoupon.SOURCE_EXCHANGE, new BigDecimal(percent)); couponNews = 1; -- Gitblit v1.8.0