From c57f9a24c525aa557225b663fa55120a36f99735 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 16 四月 2020 15:52:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/invite/ThreeSaleSerivce.java |   85 +++++++++++++++++++++++++++---------------
 1 files changed, 54 insertions(+), 31 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 98a2986..94c6792 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
@@ -68,29 +68,7 @@
 	 */
 	public int deleteByPrimaryKey(Long id);
 
-	/**
-	 * 闀挎椂闂存湭閭�璇锋垚鍔熺敤鎴�
-	 * 
-	 * @param daysNum
-	 * @return
-	 */
-	public List<Long> queryLongTimeFailed(int daysNum);
 
-	/**
-	 * 闀挎椂闂� 閭�璇锋垚鍔熺敤鎴�
-	 * 
-	 * @param daysNum
-	 * @return
-	 */
-	public List<ThreeSale> queryLongTimeSuccess(int daysNum);
-
-	/**
-	 * 璁剧疆瀵瑰簲閭�璇疯繃鏈�
-	 * 
-	 * @param list
-	 * @return
-	 */
-	public int updateExpire(List<Long> list);
 
 	/**
 	 * 涓�绾ф煡璇�
@@ -212,14 +190,6 @@
 	 */
 	public int getSuccessRelationshipNum(Long uid);
 
-	/**
-	 * 閭�璇风爜鐢熸垚涓婁笅绾у叧绯�
-	 * 
-	 * @param invitee
-	 * @param inviter
-	 * @throws ThreeSaleException
-	 */
-	public void bindRelationshipByInviteCode(UserInfo invitee, UserInfo inviter) throws ThreeSaleException;
 
 	/**
 	 * 缁熻閭�璇锋垚鍔熼槦鍛樻暟閲�
@@ -244,7 +214,7 @@
 	 * @param threeSaleOld
 	 * @throws ThreeSaleException
 	 */
-	public void bindRelationshipByWX(UserInfo invitee, Long inviterId) throws ThreeSaleException;
+	public void bindInviteRelationship(Long workerId, Long bossId) throws ThreeSaleException;
 	
 	/**
 	* 鏍规嵁涓嬬骇鏌ユ壘瀵硅薄
@@ -340,5 +310,58 @@
 	 * @throws
 	 */
 	public List<ThreeSale> getMyBossDeepList(Long uid,int deep);
+	
+	
+	/**
+	 * 鑾峰彇涓婄骇鍒楄〃
+	 * @Title: getMyBossDeepList
+	 * @Description: 
+	 * @param uid
+	 * @return 
+	 * List<ThreeSale> 杩斿洖绫诲瀷
+	 * @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