From 486e22c57ca8a1e2dc6877b539e2f3add67250f1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:28:00 +0800
Subject: [PATCH] 冲突解决

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java |    9 +++++++++
 1 files changed, 9 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 8e4b686..2cf2eb3 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
@@ -297,4 +297,13 @@
 		return hongBaoV2CountMapper.countAlreadyGetMoneyByUid(uid, typeList, minGetTime, maxGetTime);
 	}
 
+	@Override
+	public BigDecimal getShareRewardByTeamUid(Long uid, Long teamUid, Date endTime) {
+		return hongBaoV2CountMapper.getShareRewardByTeamUid(uid, teamUid, endTime);
+	}
+	
+	@Override
+	public BigDecimal getShareRewardByTeamUidLastMonth(Long uid, Long teamUid) {
+		return hongBaoV2CountMapper.getShareRewardByTeamUidLastMonth(uid, teamUid);
+	}
 }

--
Gitblit v1.8.0