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/inter/count/HongBaoV2CountService.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java
index b32849b..4ea0395 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java
@@ -184,4 +184,21 @@
 
 	public long countAlreadyGetMoneyByUid(Long uid, List<Integer> typeList, Date minGetTime, Date maxGetTime);
 
+	/**
+	 * 鏌ヨ鏉ユ簮璇ヤ笅绾ф垚鍔熷垎浜閲戞椿鍔�
+	 * @param uid
+	 * @param teamUid
+	 * @param endTime
+	 * @return
+	 */
+	public BigDecimal getShareRewardByTeamUid(Long uid, Long teamUid, Date endTime);
+
+	/**
+	 * 缁熻涓嬬骇涓婁釜鏈夋晥璁㈠崟
+	 * @param uid
+	 * @param teamUid 涓嬬骇id
+	 * @return
+	 */
+	public BigDecimal getShareRewardByTeamUidLastMonth(Long uid, Long teamUid);
+
 }

--
Gitblit v1.8.0