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 | 119 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 71 insertions(+), 48 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 dcf9194..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 {
@@ -19,40 +19,20 @@
*/
UserInfo getBoss(long uid);
- int findInviteCount(long id);
-
void bind(UserInfo invitee, UserInfo inviter) throws ThreeSaleException;
- void effective(UserInfo find);
-
- void validateTwentyFour();
-
/**
- * 閲嶆柊璁＄畻鐢ㄦ埛鐨勭瓑绾�
+ * 閭�璇峰叧绯荤敓鏁�
*
- * @param uid
+ * @param worker
*/
- void reComputeUserRank(Long uid);
-
- void validate365();
-
- // 鑾峰彇涓嬬骇鐢ㄦ埛
- List<UserInfo> getFirstUsers(Long uid, int page);
+ void effective(UserInfo worker);
// 鑾峰彇涓�绾х敤鎴锋暟閲�
long getFirstUsersCount(Long uid);
- // 鑾峰彇涓�2绾х敤鎴�
- List<UserInfo> getSecondUsers(Long uid, int page);
-
// 鑾峰彇浜岀骇鐢ㄦ埛鏁伴噺
long getSecondUsersCount(Long uid);
-
- // 鑾峰彇鏈�杩戞湁鏁堢殑鍒嗛攢鍒楄〃
- List<ThreeSale> getLastestThreeSaleList(int i, String key);
-
- // 閭�璇峰叧绯�
- int getLastestThreeSaleCount(String key);
/**
* 鏌ヨ涓�搴﹂槦鍛橀泦鍚�
@@ -154,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);
/**
* 缁熻鎵�鏈変竴绾ч槦鍛�
@@ -173,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);
/**
* 缁熻浜岀骇闃熷憳
@@ -202,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);
/**
* 鍓嶇鏌ヨ浜岀骇闃熷憳
@@ -212,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);
/**
* 鑾峰彇涓婄骇
@@ -242,10 +203,10 @@
* @return
*/
public List<ThreeSale> listByWorkerId(Long workerId);
-
-
+
/**
* 鑾峰彇鎴愬姛閭�璇峰叧绯绘暟閲�
+ *
* @param uid
* @return
*/
@@ -253,10 +214,72 @@
/**
* 閭�璇风爜鐢熸垚涓婁笅绾у叧绯�
+ *
* @param invitee
* @param inviter
* @throws ThreeSaleException
*/
public void bindRelationshipByInviteCode(UserInfo invitee, UserInfo inviter) throws ThreeSaleException;
+ /**
+ * 缁熻閭�璇锋垚鍔熼槦鍛樻暟閲�
+ *
+ * @param uid
+ * @return
+ */
+ 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
+ */
+ 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