From e65037e672ecab852e2a6c5b242cdadfd1a58b33 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 25 十一月 2019 09:30:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 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..837016f 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 getOrderRewardByTeamUid(Long uid, Long teamUid, Date endTime);
+
+	/**
+	 * 缁熻璇ヤ笅绾ф垚鍔熷垎浜� + 鑷喘璁㈠崟 
+	 * @param uid
+	 * @param teamUid 涓嬬骇id
+	 * @return
+	 */
+	public BigDecimal getOrderRewardByTeamUidTheMonth(Long uid, Long teamUid);
+
 }

--
Gitblit v1.8.0