From 235921d820f29b04b1e82f6a6f0d4a1957a900ef Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 五月 2020 12:03:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java
index 0dfdf88..df705bc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java
@@ -174,4 +174,26 @@
 	public BigDecimal sumMoneyArrivalByUidAndNearDay(Long uid, int day) {
 		return hongBaoV2CountMapper.sumMoneyArrivalByUidAndNearDay(uid, day);
 	}
+	
+	
+	@Override
+	public BigDecimal sumMoneyBySettleTimeAndUid(Long uid, Date minDate, Date maxDate) {
+		 BigDecimal money = hongBaoV2CountMapper.sumMoneyBySettleTimeAndUid(uid, minDate, maxDate);
+		 if (money == null) {
+			 money = new BigDecimal(0);
+		 }
+		 return money;
+	}
+	
+	@Override
+	public BigDecimal sumMoneyByANotSettleAndUid(Long uid) {
+		 BigDecimal money = hongBaoV2CountMapper.sumMoneyByANotSettleAndUid(uid);
+		 if (money == null) {
+			 money = new BigDecimal(0);
+		 }
+		 return money;
+	}
+	
+	
+	
 }

--
Gitblit v1.8.0