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

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 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 1c70a3e..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
@@ -206,6 +206,29 @@
 	 * @param uid
 	 * @return
 	 */
-	public BigDecimal getRewardMoneyBySelf(Long uid);
+	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