From ea022e84777312b730257dfcf2a33e865c8e07b7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 26 十一月 2019 14:23:46 +0800
Subject: [PATCH] 资金明细接口增加筛选

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java |   40 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 35 insertions(+), 5 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 4ea0395..af91066 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,21 +184,51 @@
 
 	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);
+	public BigDecimal getOrderRewardByTeamUid(Long uid, Long teamUid, Date endTime);
 
 	/**
-	 * 缁熻涓嬬骇涓婁釜鏈夋晥璁㈠崟
+	 * 缁熻璇ヤ笅绾ф垚鍔熷垎浜� + 鑷喘璁㈠崟 
 	 * @param uid
 	 * @param teamUid 涓嬬骇id
 	 * @return
 	 */
-	public BigDecimal getShareRewardByTeamUidLastMonth(Long uid, Long teamUid);
+	public BigDecimal getOrderRewardByTeamUidTheMonth(Long uid, Long teamUid);
+
+	/**
+	 * 鑷喘杩斿埄鍒拌处閲戦
+	 * @param uid
+	 * @return
+	 */
+	public BigDecimal getRewardMoneyBySelf(Long uid);
+
+	/**
+	 * 鍒嗕韩濂栧姳鍒拌处閲戦
+	 * @param uid
+	 * @return
+	 */
+	public BigDecimal getRewardMoneyByShare(Long uid);
+
+	/**
+	 * 涓嬬骇浜х敓濂栧姳鍒拌处閲戦
+	 * @param uid
+	 * @return
+	 */
+	public BigDecimal getRewardMoneyByInvite(Long uid);
+
+	/**
+	 * 鏈夋晥涓�绾ч槦鍛樺畾涔夛細2019骞�1鏈�1鏃ヨ捣(date)锛岃嚜璐垨鍒嗕韩1绗斾笖浠樻鎬婚噾棰濅笉灏忎簬 payment 鍏冿紙閫�娆句负澶辨晥
+	 * @param uid
+	 * @param date
+	 * @param payment
+	 * @return
+	 */
+	public long countValidOrderTeamUserByUid(Long uid, String date, BigDecimal payment);
 
 }

--
Gitblit v1.8.0