From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +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/hongbao/ThreeSaleSerivce.java |   37 +++++++++++++++++++++++++++++++++----
 1 files changed, 33 insertions(+), 4 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 3ff2d81..71a89f2 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
@@ -2,11 +2,11 @@
 
 import java.util.List;
 
-import net.sf.json.JSONObject;
-
 import com.yeshi.fanli.entity.bus.user.ThreeSale;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.exception.ThreeSaleException;
+
+import net.sf.json.JSONObject;
 
 public interface ThreeSaleSerivce {
 
@@ -219,7 +219,7 @@
 	 * @param inviter
 	 * @throws ThreeSaleException
 	 */
-	public void bindRelationshipByInviteCode(UserInfo invitee, UserInfo inviter, String platform, String version) throws ThreeSaleException;
+	public void bindRelationshipByInviteCode(UserInfo invitee, UserInfo inviter) throws ThreeSaleException;
 
 	/**
 	 * 缁熻閭�璇锋垚鍔熼槦鍛樻暟閲�
@@ -244,7 +244,7 @@
 	 * @param threeSaleOld
 	 * @throws ThreeSaleException
 	 */
-	public void bindRelationshipByWX(UserInfo invitee, Long inviterId, ThreeSale threeSaleOld, String platform, String version) throws ThreeSaleException;
+	public void bindRelationshipByWX(UserInfo invitee, Long inviterId, ThreeSale threeSaleOld) throws ThreeSaleException;
 	
 	/**
 	* 鏍规嵁涓嬬骇鏌ユ壘瀵硅薄
@@ -253,4 +253,33 @@
 	 */
 	public ThreeSale selectByWorkerId(Long workerId);
 
+	/**
+	 * 鏃堕棿娈靛憿 閭�璇锋垚鍔熶俊鎭�
+	 * @param bossId
+	 * @param minTime
+	 * @param maxTime
+	 * @return
+	 */
+	public List<ThreeSale> getSuccessByDate(Long bossId, Long minTime, Long maxTime);
+
+	/**
+	 * 涓�绾ч槦鍛�
+	 * @param start
+	 * @param count
+	 * @param uid
+	 * @param state
+	 * @return
+	 */
+	public List<ThreeSale> listFirstTeam(long start, int count, Long uid, Integer state);
+
+	/**
+	 * 浜岀骇闃熷憳
+	 * @param start
+	 * @param count
+	 * @param uid
+	 * @param state
+	 * @return
+	 */
+	public List<ThreeSale> listSecondTeam(long start, int count, Long uid, Integer state);
+
 }

--
Gitblit v1.8.0