From 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 29 四月 2019 08:59:47 +0800
Subject: [PATCH] Merge branch 'div_develop' into master_develop

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoV2Service.java |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 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 47db509..5c57803 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,10 +4,7 @@
 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;
 import com.yeshi.fanli.entity.order.CommonOrder;
 import com.yeshi.fanli.exception.HongBaoException;
@@ -37,12 +34,6 @@
 	 */
 	public void addHongBao(List<CommonOrder> commonOrder, int type) throws HongBaoException;
 
-	/**
-	 * 灏嗚�佺増鏈殑绾㈠寘瀵硅薄杞负鏂扮増鏈殑瀵硅薄
-	 * 
-	 * @param hb
-	 */
-	public void convert(HongBao hb);
 
 	/**
 	 * 濂栭噾鍒楄〃锛�1.4.9涔嬪墠鐨勭増鏈級
@@ -122,5 +113,21 @@
 	 * @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);
 
 }

--
Gitblit v1.8.0