From d1b7fd85615a78a476650e5acfc8b165a5deb3aa Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 12 四月 2019 11:41:05 +0800
Subject: [PATCH] Merge branch 'div'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/ThreeSaleSerivce.java |   42 ++++++++++++++++++++----------------------
 1 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/ThreeSaleSerivce.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/ThreeSaleSerivce.java
index af92733..7016bc0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/ThreeSaleSerivce.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/ThreeSaleSerivce.java
@@ -134,15 +134,6 @@
 
 	public long countSuperiorQuery(Integer state, Long uid);
 
-	/**
-	 * app绔竴绾ф煡璇�1.4.1
-	 * 
-	 * @param start
-	 * @param count
-	 * @param uid
-	 * @return
-	 */
-	public List<ThreeSale> listFirstTeam(long start, int count, Long uid);
 
 	/**
 	 * 缁熻鎵�鏈変竴绾ч槦鍛�
@@ -153,16 +144,6 @@
 	 * @return
 	 */
 	public long countFirstTeam(Long uid, Integer state);
-
-	/**
-	 * app绔簩绾ф煡璇�1.4.1
-	 * 
-	 * @param start
-	 * @param count
-	 * @param uid
-	 * @return
-	 */
-	public List<ThreeSale> listSecondTeam(long start, int count, Long uid);
 
 	/**
 	 * 缁熻浜岀骇闃熷憳
@@ -182,7 +163,7 @@
 	 * @param uid
 	 * @return
 	 */
-	public JSONObject getMyFirstTeam(long start, int count, Long uid);
+	public JSONObject getMyFirstTeam(long start, int count, Long uid, Integer state);
 
 	/**
 	 * 鍓嶇鏌ヨ浜岀骇闃熷憳
@@ -192,7 +173,7 @@
 	 * @param uid
 	 * @return
 	 */
-	public JSONObject getMySecondTeam(long start, int count, Long uid);
+	public JSONObject getMySecondTeam(long start, int count, Long uid, Integer state);
 
 	/**
 	 * 鑾峰彇涓婄骇
@@ -249,7 +230,24 @@
 	public long countSuccessFirstTeam(Long uid);
 
 	/**
-	 * 鏍规嵁涓嬬骇鏌ユ壘瀵硅薄
+	 * 鏍规嵁閭�璇疯�呮煡璇㈠叧绯�
+	 * 
+	 * @param workerId
+	 * @return
+	 */
+	public ThreeSale getByWorkerId(Long workerId);
+
+	/**
+	 * 寰俊婵�娲婚個璇烽槦鍛樺叧绯�
+	 * @param invitee
+	 * @param inviterId
+	 * @param threeSaleOld
+	 * @throws ThreeSaleException
+	 */
+	public void bindRelationshipByWX(UserInfo invitee, Long inviterId, ThreeSale threeSaleOld) throws ThreeSaleException;
+	
+	/**
+	* 鏍规嵁涓嬬骇鏌ユ壘瀵硅薄
 	 * @param workerId
 	 * @return
 	 */

--
Gitblit v1.8.0