From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinDetailServiceImpl.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinDetailServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinDetailServiceImpl.java
index e97725b..bd41976 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinDetailServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinDetailServiceImpl.java
@@ -17,8 +17,8 @@
import com.yeshi.fanli.dao.mybatis.tlj.UserTaoLiJinDetailMapper;
import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinDetail;
-import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinOrigin;
import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinDetail.TaoLiJinDetailTypeEnum;
+import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinOrigin;
import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinOrigin.TaoLiJinOriginEnum;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinDetailService;
import com.yeshi.fanli.util.TimeUtil;
@@ -170,9 +170,13 @@
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(voList.get(p).getExpend().replace("-", ""));
- finalList.get(key).getMonth().setIncome(voList.get(p).getIncome());
+ finalList.get(key).getMonth().setExpend(expend.setScale(2).toString().replace("-", ""));
+ finalList.get(key).getMonth().setIncome(income.setScale(2).toString());
p++;
}
}
@@ -206,8 +210,8 @@
// 绾㈠寘閫�鍥�
if (taoLiJinOrigin.getOrigin().equals(TaoLiJinOriginEnum.refund)) {
- detail.setType(TaoLiJinDetailTypeEnum.reduce);
- detail.setTitle(TaoLiJinDetailTypeEnum.reduce.getDesc());
+ detail.setType(TaoLiJinDetailTypeEnum.refund);
+ detail.setTitle(TaoLiJinDetailTypeEnum.refund.getDesc());
} else {
detail.setType(TaoLiJinDetailTypeEnum.add);
detail.setTitle(TaoLiJinDetailTypeEnum.add.getDesc());
@@ -221,4 +225,14 @@
userTaoLiJinDetailMapper.insertSelective(detail);
}
+
+ @Override
+ public Long countNumByDay(String preDay) {
+ return userTaoLiJinDetailMapper.countNumByDay(preDay);
+ }
+
+ @Override
+ public BigDecimal countMoneyByDay(String preDay) {
+ return userTaoLiJinDetailMapper.countMoneyByDay(preDay);
+ }
}
--
Gitblit v1.8.0