From 522315ae42936583042fc08aabda7e3c9e7a7b5d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 15:37:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/invite/ThreeSaleSerivce.java |   42 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/invite/ThreeSaleSerivce.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/invite/ThreeSaleSerivce.java
index 4f63ccf..20848e7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/invite/ThreeSaleSerivce.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/invite/ThreeSaleSerivce.java
@@ -187,21 +187,45 @@
 	 * @return
 	 */
 	public List<ThreeSale> listSecondTeam(long start, int count, Long uid);
+	
+	/**
+	 * 涓�绾ч槦鍛�
+	 * @param start
+	 * @param count
+	 * @param uid
+	 * @param state
+	 * @return
+	 */
+	public List<ThreeSale> listFirstTeam(long start, int count, Long uid, List<Long> listId);
 
+	/**
+	 * 浜岀骇闃熷憳
+	 * @param start
+	 * @param count
+	 * @param uid
+	 * @param state
+	 * @return
+	 */
+	public List<ThreeSale> listSecondTeam(long start, int count, Long uid, List<Long> listId);
+
+	public long countFirstTeam(Long uid);
+
+	public long countSecondTeam(Long uid);
+	
 	/**
 	 * 缁熻鐩存帴绮変笣鏁伴噺
 	 * 
 	 * @param uid
 	 * @return
 	 */
-	public long countFirstTeam(Long uid);
+	public long countFirstTeam(Long uid, List<Long> listId);
 
 	/**
 	 * 缁熻闂存帴绮変笣鏁伴噺
 	 * @param uid
 	 * @return
 	 */
-	public long countSecondTeam(Long uid);
+	public long countSecondTeam(Long uid, List<Long> listId);
 
 	/**
 	 * 鏌ヨ閭�璇峰叧绯� 鏃堕棿绛涢��
@@ -286,4 +310,18 @@
 	 */
 	public List<ThreeSale> listAll(int page,int pageSize);
 
+	/**
+	 * 鏍规棩鏈熺被鍨嬭繘琛岀粺璁＄洿鎺�
+	 */
+	public long countFirstTeamByDate(Long uid, int dayType);
+
+	/**
+	 *  鏍规棩鏈熺被鍨嬭繘琛岀粺璁￠棿鎺�
+	 * @param uid
+	 * @param dayType
+	 * @return
+	 */
+	public long countSecondTeamByDate(Long uid, int dayType);
+
+
 }

--
Gitblit v1.8.0