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/money/TeamEincomeRecordServiceImpl.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/TeamEincomeRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/TeamEincomeRecordServiceImpl.java
index c2bc13f..880dace 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/TeamEincomeRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/TeamEincomeRecordServiceImpl.java
@@ -1,5 +1,7 @@
package com.yeshi.fanli.service.impl.money;
+import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -36,9 +38,9 @@
}
@Override
- public List<TeamEincomeRecord> listCanRecieveRecord(Date preRecieveTime, Long uid) {
+ public List<TeamEincomeRecord> listCanRecieveRecord(Date preRecieveTime, Long uid, List<Integer> typeList) {
- return teamEincomeRecordMapper.listByUidAndPreRecieveTimeAndState(uid, preRecieveTime,
+ return teamEincomeRecordMapper.listByUidAndPreRecieveTimeAndState(uid, preRecieveTime, typeList,
TeamEincomeRecord.STATE_NOT_RECIEVE);
}
@@ -61,4 +63,38 @@
}
}
+ @Override
+ public BigDecimal getEstimateDividents(Date preGetTime, Long uid) {
+ List<Integer> typeList = new ArrayList<Integer>();
+ List<TeamEincomeRecord> list = listCanRecieveRecord(preGetTime, uid, typeList);
+ BigDecimal money = new BigDecimal(0);
+ if (list != null)
+ for (TeamEincomeRecord record : list) {
+ money = money.add(record.getMoney());
+ }
+ return money;
+ }
+
+ @Override
+ public List<Long> listCanRecieveUid(Date preRecieveTime, List<Integer> typeList, int page, int pageSize) {
+ return teamEincomeRecordMapper.listCanRecieveUid(preRecieveTime, typeList, (page - 1) * pageSize, pageSize);
+ }
+
+ @Override
+ public long countCanRecieveUid(Date preRecieveTime, List<Integer> typeList) {
+ return teamEincomeRecordMapper.countCanRecieveUid(preRecieveTime, typeList);
+ }
+
+
+ @Override
+ public BigDecimal sumRecieveByType(Long uid, int type) {
+ BigDecimal money = teamEincomeRecordMapper.sumRecieveByType(uid, type);
+ if (money == null) {
+ money = new BigDecimal(0);
+ }
+ return money;
+ }
+
+
+
}
--
Gitblit v1.8.0