From 5737c1229b265456415a20c71f12229b941a4629 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期五, 27 九月 2019 00:11:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java
index d432394..49aaf9a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java
@@ -29,6 +29,7 @@
 
 	/**
 	 * 缁熻鐢ㄦ埛绾㈠寘鏁伴噺
+	 * 
 	 * @param uid
 	 * @return
 	 */
@@ -151,8 +152,36 @@
 
 	/**
 	 * 濂栧姳鍒搁噾棰�
+	 * 
 	 * @return
 	 */
 	public BigDecimal countRebateCouponMoney();
 
+	/**
+	 * 缁熻杩斿埄璁㈠崟
+	 * @param uid
+	 * @return
+	 */
+	public long countRebateOrder(Long uid);
+
+	/**
+	 * 缁熻鍒嗕韩+ 閭�璇疯鍗�
+	 * @param uid
+	 * @return
+	 */
+	public long countShareOrInviteOrder(Long uid);
+	
+	/**
+	 * 缁熻宸插埌璐�
+	 * 
+	 * @param uid
+	 * @param typeList
+	 * @param minGetTime
+	 * @param maxGetTime
+	 * @return
+	 */
+	public BigDecimal sumAlreadyGetMoneyByUid(Long uid, List<Integer> typeList, Date minGetTime, Date maxGetTime);
+
+	public long countAlreadyGetMoneyByUid(Long uid, List<Integer> typeList, Date minGetTime, Date maxGetTime);
+
 }

--
Gitblit v1.8.0