From eb78e9183005efa02064956cc9ef2299dc2d2bdd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 15 八月 2019 16:01:58 +0800
Subject: [PATCH] Merge branch 'mater-1.6.0' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoV2Service.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 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 bb3fac5..5e34c9b 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
@@ -34,7 +34,6 @@
 	 */
 	public void addHongBao(List<CommonOrder> commonOrder, int type) throws HongBaoException;
 
-
 	/**
 	 * 濂栭噾鍒楄〃锛�1.4.9涔嬪墠鐨勭増鏈級
 	 * 
@@ -113,18 +112,19 @@
 	 * @return
 	 */
 	BigDecimal getUnRecievedMoneyWithPreGetTime(Long uid, Date minDate, Date maxDate);
-	
-	
+
 	/**
 	 * 璁＄畻璧勯噾
+	 * 
 	 * @param uid
 	 * @param state
 	 * @return
 	 */
-	BigDecimal computeMoneyByUidAndState(Long uid,int state);
+	BigDecimal computeMoneyByUidAndState(Long uid, int state);
 
 	/**
 	 * 鏌ヨ瀛愮孩鍖�
+	 * 
 	 * @param id
 	 * @return
 	 */
@@ -132,8 +132,16 @@
 
 	/**
 	 * 鏈�杩�30澶╁唴浜х敓杩囧垎浜鍗曠殑鐢ㄦ埛
+	 * 
 	 * @return
 	 */
 	public List<Long> getUidByNear30DayShareSucceed();
 
+	/**
+	 * 璁╅個璇疯禋澶辨晥锛堟牴鎹笅绾х敤鎴稩D锛�
+	 * @param parentUid
+	 * @param beiZhu
+	 */
+	public void invalidInviteHongBaoByParentUid(Long parentUid, String beiZhu);
+
 }

--
Gitblit v1.8.0