From 2f2860b50f24e5e3598d223db03d43df61d95c97 Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期五, 13 三月 2020 16:31:30 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/invite/ThreeSaleSerivce.java |   50 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 48 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 8950bb5..0c5de54 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
@@ -19,7 +19,7 @@
 	 */
 	UserInfo getBoss(long uid);
 
-	void bind(UserInfo invitee, UserInfo inviter) throws ThreeSaleException;
+	void bind(UserInfo worker, UserInfo boss) throws ThreeSaleException;
 
 	/**
 	 * 閭�璇峰叧绯荤敓鏁�
@@ -244,7 +244,7 @@
 	 * @param threeSaleOld
 	 * @throws ThreeSaleException
 	 */
-	public void bindRelationshipByWX(UserInfo invitee, Long inviterId, ThreeSale threeSaleOld) throws ThreeSaleException;
+	public void bindRelationshipByWX(UserInfo invitee, Long inviterId) throws ThreeSaleException;
 	
 	/**
 	* 鏍规嵁涓嬬骇鏌ユ壘瀵硅薄
@@ -252,6 +252,15 @@
 	 * @return
 	 */
 	public ThreeSale selectByWorkerId(Long workerId);
+	
+	
+	/**
+	 * 鏌ヨ鏈�杩戜竴鏉℃暟鎹紙鏍规嵁涓嬬骇鐢ㄦ埛ID涓庣姸鎬侊級
+	 * @param workerId
+	 * @param state
+	 * @return
+	 */
+	public ThreeSale selectLatestByWorkerIdAndState(Long workerId,int state);
 
 	/**
 	 * 鏃堕棿娈靛憿 閭�璇锋垚鍔熶俊鎭�
@@ -282,4 +291,41 @@
 	 */
 	public List<ThreeSale> listSecondTeam(long start, int count, Long uid, Integer state);
 
+	/**
+	 * 鏌ヨ閭�璇峰叧绯� 鏃堕棿绛涢��
+	 * @param workerId 涓嬬骇id
+	 * @param time
+	 * @return
+	 */
+	public ThreeSale getByWorkerIdAndTime(Long workerId, long time);
+
+	/**
+	 * 閭�璇峰叧绯昏劚绂�
+	 * @param workerId
+	 * @param bossId
+	 */
+	public void inviteSeparate(Long workerId, Long bossId);
+
+	
+	/*
+	 * 璇ラ槦鍛� 鍦ㄩ槦涓帓绗嚑
+	 */
+	public long getTeamOrderNumByWorkerId(Long workerId);
+
+	/**
+	 * 鏌ヨ鏈�杩戝叧绯� - 鏈夋晥鍒欎紭鍏�
+	 * @param bossId
+	 * @param workerId
+	 * @return
+	 */
+	public ThreeSale getNearRelationByBossIdAndWorkerId(Long bossId, Long workerId);
+
+	/**
+	 * 鏍规嵁鏃堕棿绛涢�夊嚭鏈夋晥绮変笣
+	 * @param bossId
+	 * @param limitTime
+	 * @return
+	 */
+	public List<ThreeSale> getValidWorkerIdsByTime(Long bossId, long limitTime);
+
 }

--
Gitblit v1.8.0