From e8f00cc0506705a2bed7dd4e060541230a7d2ab2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 28 四月 2020 14:50:55 +0800
Subject: [PATCH] 线上版本用户升级普通会员
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderHongBaoMoneyComputeServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderHongBaoMoneyComputeServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderHongBaoMoneyComputeServiceImpl.java
index e0e5edc..d312159 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderHongBaoMoneyComputeServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderHongBaoMoneyComputeServiceImpl.java
@@ -18,6 +18,7 @@
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
+import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.user.UserLevelUtil;
@@ -174,14 +175,16 @@
key = String.format("official_subsidy_zigou_%s", userLevel.getLevel());
BigDecimal rate = null;
if (date != null)
- rate = hongBaoManageService.getByKeyAndMaxTime(key, date.getTime());
+ rate = hongBaoManageService.getByKeyAndMaxTimeCache(key, TimeUtil
+ .convertToTimeTemp(TimeUtil.getGernalTime(date.getTime(), "yyyy-MM-dd HH"), "yyyy-MM-dd HH"));
else
rate = new BigDecimal(hongBaoManageService.get(key));
return rate;
}
private BigDecimal getRateByLevel(UserLevelEnum level, Date date) {
- BigDecimal baseRate = hongBaoManageService.getBaseFanliRate(date.getTime());
+ BigDecimal baseRate = hongBaoManageService.getBaseFanliRateCache(
+ TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(date.getTime(), "yyyy-MM-dd HH"), "yyyy-MM-dd HH"));
BigDecimal subsidyRate = getOfficialSubsidyRate(date, level, false);
@@ -379,7 +382,9 @@
}
private BigDecimal getFanliRate(Date time, UserLevelEnum userLevel) {
- BigDecimal rate = hongBaoManageService.getBaseFanliRate(time.getTime())
+ BigDecimal rate = hongBaoManageService
+ .getBaseFanliRateCache(TimeUtil
+ .convertToTimeTemp(TimeUtil.getGernalTime(time.getTime(), "yyyy-MM-dd HH"), "yyyy-MM-dd HH"))
.add(getOfficialSubsidyRate(time, getCommonUserLevel(time, userLevel), false));
if (userLevel == UserLevelEnum.normalVIP)
--
Gitblit v1.8.0