From 148af6b2f57be264c84d0991237fbd7ddea491a4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 04 十一月 2019 09:55:55 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackDetailServiceImpl.java | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackDetailServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackDetailServiceImpl.java
index 7957c25..f0c703e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackDetailServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackDetailServiceImpl.java
@@ -18,6 +18,7 @@
import com.yeshi.fanli.dao.mybatis.redpack.RedPackDetailMapper;
import com.yeshi.fanli.entity.redpack.RedPackDetail;
import com.yeshi.fanli.service.inter.redpack.RedPackDetailService;
+import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.vo.redpack.RedPackDetailVO;
import com.yeshi.fanli.vo.redpack.RedPackMonthVO;
@@ -32,29 +33,27 @@
public void insertSelective(RedPackDetail record) {
redPackDetailMapper.insertSelective(record);
}
-
+
@Override
public void updateByPrimaryKeySelective(RedPackDetail record) {
redPackDetailMapper.updateByPrimaryKeySelective(record);
}
-
+
@Override
public RedPackDetail getByIdentifyCode(String identifyCode) {
return redPackDetailMapper.getByIdentifyCode(identifyCode);
}
-
+
@Override
public BigDecimal countAddMoneyByDate(long uid, int dateType) {
return redPackDetailMapper.countAddMoneyByDate(uid, dateType);
}
-
@Override
public BigDecimal countUseMoneyByDate(long uid, int dateType) {
return redPackDetailMapper.countUseMoneyByDate(uid, dateType);
}
-
-
+
@Override
public List<RedPackDetailVO> listUserMoneyDetailForClient(Long uid, Long detailId, Date maxTime) {
List<RedPackDetailVO> finalList = new ArrayList<>();
@@ -176,10 +175,10 @@
keys = monthMap.keySet().iterator();
while (keys.hasNext()) {
Integer key = keys.next();
-
+
BigDecimal expend = new BigDecimal(voList.get(p).getExpend());
BigDecimal income = new BigDecimal(voList.get(p).getIncome());
-
+
// 鍘婚櫎鏀嚭璐熷彿
finalList.get(key).getMonth().setExpend(expend.setScale(2).toString().replace("-", ""));
finalList.get(key).getMonth().setIncome(income.setScale(2).toString());
@@ -189,7 +188,6 @@
return finalList;
}
-
@Override
public long countUserMoneyDetailForClient(Long uid, Long detailId, Date maxTime) {
long monthCount = 0L;
@@ -198,7 +196,8 @@
if (maxTime == null) {
detailCount = redPackDetailMapper.selectCountByUid(uid);
// 鐢ㄤ簬琛ㄧず褰撳墠鎵�鏈�
- monthCount = redPackDetailMapper.selectMonthCountByUid(uid, new Date(System.currentTimeMillis() + 1000 * 60 * 60L));
+ monthCount = redPackDetailMapper.selectMonthCountByUid(uid,
+ new Date(System.currentTimeMillis() + 1000 * 60 * 60L));
} else {// 閫氳繃鏃堕棿绛涢�変簡鐨勶紝闇�瑕佹煡璇㈡墍鏈�
detailCount = redPackDetailMapper.selectCountByUidAndMaxCreateTime(uid, maxTime);
monthCount = redPackDetailMapper.selectMonthCountByUid(uid, maxTime);
@@ -206,8 +205,18 @@
return monthCount + detailCount;
}
-
-
-
-
+
+ @Override
+ public void changeDisplayByIdentifyCode(String code, boolean disPlay) {
+ if (StringUtil.isNullOrEmpty(code))
+ return;
+ RedPackDetail oldDetail = getByIdentifyCode(code);
+ if (oldDetail != null) {// 澶栨樉绾㈠寘璇︽儏
+ RedPackDetail update = new RedPackDetail();
+ update.setId(oldDetail.getId());
+ update.setDisplay(true);
+ redPackDetailMapper.updateByPrimaryKeySelective(update);
+ }
+ }
+
}
--
Gitblit v1.8.0