From 13ec337a0d24485d9f006cfd44ea5d69c00540f3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 11 一月 2019 16:21:22 +0800
Subject: [PATCH] 资金统计修改

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoV2Service.java |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoV2Service.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoV2Service.java
index 7c20f54..47db509 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoV2Service.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoV2Service.java
@@ -4,6 +4,8 @@
 import java.util.Date;
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.yeshi.fanli.dto.HongBaoDTO;
 import com.yeshi.fanli.entity.bus.user.HongBao;
 import com.yeshi.fanli.entity.bus.user.HongBaoV2;
@@ -84,8 +86,7 @@
 	 * @return
 	 */
 	BigDecimal getUnGetTiChengMoney(Long uid);
-	
-	
+
 	/**
 	 * 鑾峰彇鎬诲叡杩斿埄閲戦
 	 * 
@@ -101,14 +102,25 @@
 	 * @return
 	 */
 	BigDecimal getUnRecievedFanLiMoney(Long uid);
-	
+
 	/**
-	 * 灏氭湭鍒拌处鐨勯噾棰�
+	 * 灏氭湭鍒拌处鐨勯噾棰�(鏍规嵁鍒涘缓鏃堕棿)
+	 * 
 	 * @param uid
 	 * @param minDate
 	 * @param maxDate
 	 * @return
 	 */
-	BigDecimal getUnRecievedMoneyWithCreateTime(Long uid,Date minDate,Date maxDate);
+	BigDecimal getUnRecievedMoneyWithCreateTime(Long uid, Date minDate, Date maxDate);
+
+	/**
+	 * 灏氭湭鍒拌处鐨勯噾棰�(鏍规嵁棰勮棰嗗彇鏃堕棿)
+	 * 
+	 * @param uid
+	 * @param minDate
+	 * @param maxDate
+	 * @return
+	 */
+	BigDecimal getUnRecievedMoneyWithPreGetTime(Long uid, Date minDate, Date maxDate);
 
 }

--
Gitblit v1.8.0