From 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 29 四月 2019 08:59:47 +0800
Subject: [PATCH] Merge branch 'div_develop' into master_develop
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoManageServiceImpl.java | 87 ++++++++++++++++++++++++++++---------------
1 files changed, 57 insertions(+), 30 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 8969696..791d29b 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
@@ -6,16 +6,11 @@
import java.util.Map;
import javax.annotation.Resource;
-import javax.transaction.Transactional;
-import org.hibernate.HibernateException;
-import org.hibernate.Query;
-import org.hibernate.Session;
import org.springframework.cache.annotation.Cacheable;
-import org.springframework.orm.hibernate4.HibernateCallback;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
-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;
@@ -25,41 +20,26 @@
public class HongBaoManageServiceImpl implements HongBaoManageService {
@Resource
- private HongBaoManageDao hongBaoManageDao;
-
- @Resource
private HongBaoManageMapper hongBaoManageMapper;
-
- public List<HongBaoManage> getHongBaoManage() {
- List<HongBaoManage> list = hongBaoManageDao.list("from HongBaoManage");
- return list;
- }
@Transactional
public void update(List<HongBaoManage> hongBaoManageList) {
for (HongBaoManage hongBaoManage : hongBaoManageList) {
- hongBaoManageDao.update(hongBaoManage);
+ hongBaoManageMapper.updateByPrimaryKeySelective(hongBaoManage);
}
}
@Cacheable(value = "homeBaoManage", key = "#p0")
public String get(final String key) {
- return (String) hongBaoManageDao.excute(new HibernateCallback<String>() {
- public String doInHibernate(Session session) throws HibernateException {
- Query query = session.createQuery("from HongBaoManage hbm where hbm.key = ? ");
- query.setParameter(0, key);
- List<HongBaoManage> list = query.list();
- if (list.size() == 0) {
- return null;
- }
- return list.get(0).getValue();
- }
- });
+ HongBaoManage hongBaoManage = hongBaoManageMapper.selectByKey(key);
+ if (hongBaoManage != null)
+ hongBaoManage.getValue();
+ return null;
}
@Cacheable(value = "homeBaoManage", key = "'convertMap'")
public Map<String, String> convertMap() {
- List<HongBaoManage> list = hongBaoManageDao.list("from HongBaoManage");
+ List<HongBaoManage> list = hongBaoManageMapper.listAll();
Map<String, String> map = new HashMap<String, String>();
for (HongBaoManage hongBaoManage : list) {
map.put(hongBaoManage.getKey(), hongBaoManage.getValue());
@@ -116,8 +96,7 @@
hongBaoManage = hongBaoManageMapper.selectByKey(key);
if (hongBaoManage != null)
return new BigDecimal(hongBaoManage.getValue());
- LogHelper.error("鑾峰彇杩斿埄鍒嗘垚姣斾緥鍑洪敊");
- return null;
+ return new BigDecimal(0);
}
@Override
@@ -135,7 +114,55 @@
if (hongBaoManage != null)
return new BigDecimal(hongBaoManage.getValue());
LogHelper.error("鑾峰彇杩斿埄鍒嗘垚姣斾緥鍑洪敊");
- return null;
+ return new BigDecimal(0);
+ }
+
+ @Override
+ public BigDecimal getFirstShareRate(int urank) {
+ String key = "share_21_" + urank;
+ HongBaoManage hongBaoManage = hongBaoManageMapper.selectByKeyAndMaxValidTime(key, System.currentTimeMillis());
+ if (hongBaoManage == null)
+ hongBaoManage = hongBaoManageMapper.selectByKey(key);
+ if (hongBaoManage != null)
+ return new BigDecimal(hongBaoManage.getValue());
+ LogHelper.error("鑾峰彇杩斿埄鍒嗘垚姣斾緥鍑洪敊");
+ return new BigDecimal(0);
+ }
+
+ @Override
+ public BigDecimal getFirstShareRate(int urank, long time) {
+ String key = "share_21_" + urank;
+ HongBaoManage hongBaoManage = hongBaoManageMapper.selectByKeyAndMaxValidTime(key, time);
+ if (hongBaoManage == null)
+ hongBaoManage = hongBaoManageMapper.selectByKey(key);
+ if (hongBaoManage != null)
+ return new BigDecimal(hongBaoManage.getValue());
+ LogHelper.error("鑾峰彇杩斿埄鍒嗘垚姣斾緥鍑洪敊");
+ return new BigDecimal(0);
+ }
+
+ @Override
+ public BigDecimal getSecondShareRate(int urank) {
+ String key = "share_22_" + urank;
+ HongBaoManage hongBaoManage = hongBaoManageMapper.selectByKeyAndMaxValidTime(key, System.currentTimeMillis());
+ if (hongBaoManage == null)
+ hongBaoManage = hongBaoManageMapper.selectByKey(key);
+ if (hongBaoManage != null)
+ return new BigDecimal(hongBaoManage.getValue());
+ LogHelper.error("鑾峰彇杩斿埄鍒嗘垚姣斾緥鍑洪敊");
+ return new BigDecimal(0);
+ }
+
+ @Override
+ public BigDecimal getSecondShareRate(int urank, long time) {
+ String key = "share_22_" + urank;
+ HongBaoManage hongBaoManage = hongBaoManageMapper.selectByKeyAndMaxValidTime(key, time);
+ if (hongBaoManage == null)
+ hongBaoManage = hongBaoManageMapper.selectByKey(key);
+ if (hongBaoManage != null)
+ return new BigDecimal(hongBaoManage.getValue());
+ LogHelper.error("鑾峰彇杩斿埄鍒嗘垚姣斾緥鍑洪敊");
+ return new BigDecimal(0);
}
}
--
Gitblit v1.8.0