From f32cc15f60bf3b5c47267ee256a0deb3bdd01eec Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 23 四月 2020 14:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/invite/ThreeSaleSerivce.java |  109 ++++++++++--------------------------------------------
 1 files changed, 20 insertions(+), 89 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 384b1ba..00f0d1e 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
@@ -28,23 +28,6 @@
 	 */
 	void effective(UserInfo worker);
 
-	// 鑾峰彇涓�绾х敤鎴锋暟閲�
-	long getFirstUsersCount(Long uid);
-
-	// 鑾峰彇浜岀骇鐢ㄦ埛鏁伴噺
-	long getSecondUsersCount(Long uid);
-
-
-
-	/**
-	 * 鍒犻櫎閭�璇峰叧绯籭d
-	 * 
-	 * @param id
-	 * @return
-	 */
-	public int deleteByPrimaryKey(Long id);
-
-
 
 	/**
 	 * 涓�绾ф煡璇�
@@ -89,25 +72,6 @@
 	public long countSuperiorQuery(Integer state, Long uid);
 
 
-	/**
-	 * 缁熻鎵�鏈変竴绾ч槦鍛�
-	 * 
-	 * @param uid
-	 * @param state
-	 *            鐘舵�侊紝鍊� 涓虹┖鏃跺垯缁熻鎵�鏈�
-	 * @return
-	 */
-	public long countFirstTeam(Long uid, Integer state);
-
-	/**
-	 * 缁熻浜岀骇闃熷憳
-	 * 
-	 * @param uid
-	 * @param state
-	 *            鐘舵�侊紝鍊� 涓虹┖鏃跺垯缁熻鎵�鏈�
-	 * @return
-	 */
-	public long countSecondTeam(Long uid, Integer state);
 
 	/**
 	 * 鍓嶇鏌ヨ涓�绾ч槦鍛�
@@ -117,7 +81,7 @@
 	 * @param uid
 	 * @return
 	 */
-	public JSONObject getMyFirstTeam(long start, int count, Long uid, Integer state);
+	public JSONObject getMyFirstTeam(long start, int count, Long uid);
 
 	/**
 	 * 鍓嶇鏌ヨ浜岀骇闃熷憳
@@ -127,7 +91,7 @@
 	 * @param uid
 	 * @return
 	 */
-	public JSONObject getMySecondTeam(long start, int count, Long uid, Integer state);
+	public JSONObject getMySecondTeam(long start, int count, Long uid);
 
 	/**
 	 * 鑾峰彇涓婄骇
@@ -166,14 +130,6 @@
 	 */
 	public int getSuccessRelationshipNum(Long uid);
 
-
-	/**
-	 * 缁熻閭�璇锋垚鍔熼槦鍛樻暟閲�
-	 * 
-	 * @param uid
-	 * @return
-	 */
-	public long countSuccessFirstTeam(Long uid);
 
 	/**
 	 * 鏍规嵁閭�璇疯�呮煡璇㈠叧绯�
@@ -225,7 +181,7 @@
 	 * @param state
 	 * @return
 	 */
-	public List<ThreeSale> listFirstTeam(long start, int count, Long uid, Integer state);
+	public List<ThreeSale> listFirstTeam(long start, int count, Long uid);
 
 	/**
 	 * 浜岀骇闃熷憳
@@ -235,8 +191,24 @@
 	 * @param state
 	 * @return
 	 */
-	public List<ThreeSale> listSecondTeam(long start, int count, Long uid, Integer state);
+	public List<ThreeSale> listSecondTeam(long start, int count, Long uid);
 
+	
+	/**
+	 * 缁熻鐩存帴绮変笣鏁伴噺
+	 * 
+	 * @param uid
+	 * @return
+	 */
+	public long countFirstTeam(Long uid);
+
+	/**
+	 * 缁熻闂存帴绮変笣鏁伴噺
+	 * @param uid
+	 * @return
+	 */
+	public long countSecondTeam(Long uid);
+	
 	/**
 	 * 鏌ヨ閭�璇峰叧绯� 鏃堕棿绛涢��
 	 * @param workerId 涓嬬骇id
@@ -298,46 +270,5 @@
 	 * @throws
 	 */
 	public List<ThreeSale> getMyBossDeepList(Long uid);
-
-	/**
-	 * 鏌ヨ鏈垹闄ょ増-绮変笣涓�绾�
-	 * @param start
-	 * @param count
-	 * @param uid
-	 * @return
-	 */
-	public List<ThreeSale> listFirstTeamByUndeleted(long start, int count, Long uid);
-
-	/**
-	 * 缁熻绮変笣涓�绾�
-	 * @param uid
-	 * @return
-	 */
-	public long countFirstTeamByUndeleted(Long uid);
-
-	/**
-	 * 鏌ヨ鏈垹闄ょ増-绮変笣浜岀骇
-	 * @param start
-	 * @param count
-	 * @param uid
-	 * @return
-	 */
-	public List<ThreeSale> listSecondTeamByUndeleted(long start, int count, Long uid);
-
-	/**
-	 * 缁熻绮変笣浜岀骇
-	 * @param uid
-	 * @return
-	 */
-	public long countSecondTeamByUndeleted(Long uid);
-
-	
-	/**
-	 * 鍒犻櫎鑴辩闃熷憳
-	 * @param id
-	 * @param uid
-	 * @param tid
-	 */
-	public void remvoeBreak(Long id, Long uid, Long tid);
 
 }

--
Gitblit v1.8.0