From d4c19062530c46203b0950b20e66afdeefcdf3a6 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期一, 10 十二月 2018 14:13:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoManageServiceImpl.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoManageServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoManageServiceImpl.java
index 16fb72c..8fd9059 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoManageServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoManageServiceImpl.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.service.impl.hongbao;
+import java.math.BigDecimal;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -15,7 +16,9 @@
import org.springframework.stereotype.Service;
import com.yeshi.fanli.dao.hongbao.HongBaoManageDao;
+import com.yeshi.fanli.dao.mybatis.HongBaoManageMapper;
import com.yeshi.fanli.entity.bus.user.HongBaoManage;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
@Service
@@ -23,6 +26,9 @@
@Resource
private HongBaoManageDao hongBaoManageDao;
+
+ @Resource
+ private HongBaoManageMapper hongBaoManageMapper;
public List<HongBaoManage> getHongBaoManage() {
List<HongBaoManage> list = hongBaoManageDao.list("from HongBaoManage");
@@ -61,4 +67,39 @@
return map;
}
+ @Override
+ public BigDecimal getFanLiRate(long time) {
+ String key = "hongbao_goods_proportion";
+
+ HongBaoManage hongBaoManage = hongBaoManageMapper.selectByKeyAndMaxValidTime(key, time);
+ if (hongBaoManage == null)
+ hongBaoManage = hongBaoManageMapper.selectByKey(key);
+ if (hongBaoManage != null)
+ return new BigDecimal(hongBaoManage.getValue());
+ LogHelper.error("鑾峰彇杩斿埄鍒嗘垚姣斾緥鍑洪敊");
+ return null;
+ }
+
+ @Override
+ public BigDecimal getShareRate(long time) {
+ String key = "share_proportion";
+ HongBaoManage hongBaoManage = hongBaoManageMapper.selectByKeyAndMaxValidTime(key, time);
+ if (hongBaoManage == null)
+ hongBaoManage = hongBaoManageMapper.selectByKey(key);
+ if (hongBaoManage != null)
+ return new BigDecimal(hongBaoManage.getValue());
+ LogHelper.error("鑾峰彇鍒嗕韩璧氬垎鎴愭瘮渚嬪嚭閿�");
+ return null;
+ }
+
+ @Override
+ public BigDecimal getFanLiRate() {
+ return getFanLiRate(System.currentTimeMillis());
+ }
+
+ @Override
+ public BigDecimal getShareRate() {
+ return getShareRate(System.currentTimeMillis());
+ }
+
}
--
Gitblit v1.8.0