From 522315ae42936583042fc08aabda7e3c9e7a7b5d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 15:37:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 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 ebc38db..eb69a6b 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
@@ -199,6 +199,31 @@
 	public long countMyDirectOrderByCashArrival(Long uid, BigDecimal payment);
 
 
-	public BigDecimal geBonusByuid(Long uid, Integer dateType, Integer hbType, Integer moneyState);
+	public BigDecimal geBonusByuid(Long uid, Integer dateType, Integer hbType, Integer moneyState);
+
+	/**
+	 * 缁熻杩戞棩鍒拌处鏀跺叆閲戦
+	 * @param uid
+	 * @param day
+	 * @return
+	 */
+	public BigDecimal sumMoneyArrivalByUidAndNearDay(Long uid, int day);
+
+	/**
+	 * 缁熻鏀惰揣閲戦
+	 * @param uid
+	 * @param minDate
+	 * @param maxDate
+	 * @return
+	 */
+	public BigDecimal sumMoneyBySettleTimeAndUid(Long uid, Date minDate, Date maxDate);
+
+	
+	/**
+	 * 180澶╁唴鏈敹璐х殑閲戦
+	 * @param uid
+	 * @return
+	 */
+	public BigDecimal sumMoneyByANotSettleAndUid(Long uid);
 
 }

--
Gitblit v1.8.0