From 0ffd316f9fb2c967f9d643c6a45a965511566aea Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 26 十一月 2019 15:46:18 +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/money/UserMoneyDetailServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 4f10898..ddc0b09 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
@@ -39,7 +39,8 @@
}
@Override
- public List<UserMoneyDetailHistoryVO> listUserMoneyDetailForClient(Long uid, Long userMoneyDetailId, Date maxTime) {
+ public List<UserMoneyDetailHistoryVO> listUserMoneyDetailForClient(Long uid, Long userMoneyDetailId,int type, Date maxTime) {
+ //TODO 澧炲姞type绛涢��
List<UserMoneyDetailHistoryVO> finalList = new ArrayList<>();
List<UserMoneyDetail> list = null;
if (userMoneyDetailId == null) {// 棣栨璇锋眰
@@ -191,7 +192,8 @@
}
@Override
- public long countUserMoneyDetailForClient(Long uid, Long userMoneyDetailId, Date maxTime) {
+ public long countUserMoneyDetailForClient(Long uid, Long userMoneyDetailId,int type, Date maxTime) {
+ //TODO 澧炲姞type绛涢��
long monthCount = 0L;
long detailCount = 0L;
// 鏈�氳繃鏃堕棿绛涢�夛紝鏌ヨ鎵�鏈�
--
Gitblit v1.8.0