From 88e7382670bf6c88e5e550f92e36307643cb5d5a Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 14 四月 2020 16:37:06 +0800
Subject: [PATCH] 资金统计

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyDetailServiceImpl.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyDetailServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyDetailServiceImpl.java
index 54301e7..4f6aaea 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyDetailServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyDetailServiceImpl.java
@@ -229,11 +229,23 @@
 			for (UserMoneyDetailTypeEnum type : typeList) {
 				list.add(type.name());
 			}
-		BigDecimal money = userMoneyDetailMapper.getTotalMoneyByTypeAndUidWithDate(uid, list, minDate, maxDate);
+		BigDecimal money = userMoneyDetailMapper.getTotalMoneyByTypeAndUidWithDate(uid, list, minDate, maxDate, null);
 		return money == null ? new BigDecimal(0) : money;
 	}
 
 	@Override
+	public BigDecimal statisticUserTypeMoneyWithDate(Long uid, List<UserMoneyDetailTypeEnum> typeList, Date minDate,
+			Date maxDate, Integer show) {
+		List<String> list = new ArrayList<>();
+		if (typeList != null)
+			for (UserMoneyDetailTypeEnum type : typeList) {
+				list.add(type.name());
+			}
+		BigDecimal money = userMoneyDetailMapper.getTotalMoneyByTypeAndUidWithDate(uid, list, minDate, maxDate, show);
+		return money == null ? new BigDecimal(0) : money;
+	}
+	
+	@Override
 	public UserMoneyDetail selectByTypeAndUidAndIdentifyCode(UserMoneyDetailTypeEnum type, Long uid,
 			Long sourceIdentifyId) {
 		return userMoneyDetailMapper.selectByTypeAndUidAndIdentifyCode(type, uid, sourceIdentifyId);

--
Gitblit v1.8.0