From 96a415a0de73542ddb5da7eaa61e4d7e55065ae3 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期六, 12 一月 2019 15:30:55 +0800
Subject: [PATCH] Merge branch 'div1'

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java
index 1d799bf..fd1a012 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java
@@ -81,6 +81,28 @@
 	BigDecimal getUnRecievedFanLiMoney(Long uid);
 
 	/**
+	 * 鏍规嵁鍒涘缓鏃堕棿涓庣敤鎴稩D鑾峰彇鏈埌璐︾殑閲戦
+	 * 
+	 * @param uid
+	 * @param minDate
+	 * @param maxDate
+	 * @return
+	 */
+	BigDecimal getUnRecievedMoneyWithCreateTime(@Param("uid") Long uid, @Param("minDate") Date minDate,
+			@Param("maxDate") Date maxDate);
+
+	/**
+	 * 鏍规嵁棰勮棰嗗彇鏃堕棿涓庣敤鎴稩D鑾峰彇鏈埌璐︾殑閲戦
+	 * 
+	 * @param uid
+	 * @param minDate
+	 * @param maxDate
+	 * @return
+	 */
+	BigDecimal getUnRecievedMoneyWithPreGetTime(@Param("uid") Long uid, @Param("minDate") Date minDate,
+			@Param("maxDate") Date maxDate);
+
+	/**
 	 * 鏍规嵁绾㈠寘绫诲瀷鑾峰彇缁撶畻鍒楄〃
 	 * 
 	 * @param type

--
Gitblit v1.8.0