From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoV2Service.java |   49 +++++++++++++++++++++++++++++++++++++------------
 1 files changed, 37 insertions(+), 12 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..bb3fac5 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
@@ -5,7 +5,6 @@
 import java.util.List;
 
 import com.yeshi.fanli.dto.HongBaoDTO;
-import com.yeshi.fanli.entity.bus.user.HongBao;
 import com.yeshi.fanli.entity.bus.user.HongBaoV2;
 import com.yeshi.fanli.entity.order.CommonOrder;
 import com.yeshi.fanli.exception.HongBaoException;
@@ -35,12 +34,6 @@
 	 */
 	public void addHongBao(List<CommonOrder> commonOrder, int type) throws HongBaoException;
 
-	/**
-	 * 灏嗚�佺増鏈殑绾㈠寘瀵硅薄杞负鏂扮増鏈殑瀵硅薄
-	 * 
-	 * @param hb
-	 */
-	public void convert(HongBao hb);
 
 	/**
 	 * 濂栭噾鍒楄〃锛�1.4.9涔嬪墠鐨勭増鏈級
@@ -84,8 +77,7 @@
 	 * @return
 	 */
 	BigDecimal getUnGetTiChengMoney(Long uid);
-	
-	
+
 	/**
 	 * 鑾峰彇鎬诲叡杩斿埄閲戦
 	 * 
@@ -101,14 +93,47 @@
 	 * @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);
+	
+	
+	/**
+	 * 璁＄畻璧勯噾
+	 * @param uid
+	 * @param state
+	 * @return
+	 */
+	BigDecimal computeMoneyByUidAndState(Long uid,int state);
+
+	/**
+	 * 鏌ヨ瀛愮孩鍖�
+	 * @param id
+	 * @return
+	 */
+	public List<HongBaoV2> listChildrenById(Long id);
+
+	/**
+	 * 鏈�杩�30澶╁唴浜х敓杩囧垎浜鍗曠殑鐢ㄦ埛
+	 * @return
+	 */
+	public List<Long> getUidByNear30DayShareSucceed();
 
 }

--
Gitblit v1.8.0