From 32f8ab2806fb088335e24983477f5179064ada9d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 29 十一月 2019 17:37:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java |   19 ++++++++++++++++++-
 1 files changed, 18 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 af91066..f2a00e4b 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
@@ -229,6 +229,23 @@
 	 * @param payment
 	 * @return
 	 */
-	public long countValidOrderTeamUserByUid(Long uid, String date, BigDecimal payment);
+	public long countValidOrderTeamUserByUid(Long uid, Long time, BigDecimal payment);
+
+	/**
+	 * 缁熻涓嶅悓鏃堕棿锛氬鍔�
+	 * @param uid
+	 * @param dateType
+	 * @param hbType
+	 * @return
+	 */
+	public BigDecimal getRewardMoneyByDate(Long uid, Integer dateType, Integer hbType, Integer orderState);
+
+	/**
+	 * 缁熻绾㈠寘涓暟
+	 * @param uid
+	 * @param type 绾㈠寘绫诲瀷
+	 * @return
+	 */
+	public long getHongBaoCount(Long uid, Integer type);
 
 }

--
Gitblit v1.8.0