From 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 29 四月 2019 08:59:47 +0800
Subject: [PATCH] Merge branch 'div_develop' into master_develop
---
fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/ThreeSaleSerivce.java | 215 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 180 insertions(+), 35 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 1c1ea4c..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
@@ -2,8 +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;
public interface ThreeSaleSerivce {
@@ -16,44 +19,24 @@
*/
UserInfo getBoss(long uid);
- int findInviteCount(long id);
-
- void bind(UserInfo invitee, UserInfo inviter);
-
- void effective(UserInfo find);
-
- void validateTwentyFour();
+ void bind(UserInfo invitee, UserInfo inviter) throws ThreeSaleException;
/**
- * 閲嶆柊璁＄畻鐢ㄦ埛鐨勭瓑绾�
+ * 閭�璇峰叧绯荤敓鏁�
*
- * @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);
-
-
/**
* 鏌ヨ涓�搴﹂槦鍛橀泦鍚�
+ *
* @param start
* @param count
* @param key
@@ -66,6 +49,7 @@
/**
* 鏌ヨ浜屽害闃熷憳闆嗗悎
+ *
* @param start
* @param count
* @param key
@@ -78,34 +62,195 @@
/**
* 鍒犻櫎閭�璇峰叧绯籭d
+ *
* @param id
* @return
*/
public int deleteByPrimaryKey(Long id);
-
-
/**
- * 闀挎椂闂存湭閭�璇锋垚鍔熺敤鎴�
+ * 闀挎椂闂存湭閭�璇锋垚鍔熺敤鎴�
+ *
* @param daysNum
* @return
*/
public List<Long> queryLongTimeFailed(int daysNum);
-
- /**
- * 闀挎椂闂� 閭�璇锋垚鍔熺敤鎴�
- * @param daysNum
- * @return
- */
+ /**
+ * 闀挎椂闂� 閭�璇锋垚鍔熺敤鎴�
+ *
+ * @param daysNum
+ * @return
+ */
public List<ThreeSale> queryLongTimeSuccess(int daysNum);
-
/**
* 璁剧疆瀵瑰簲閭�璇疯繃鏈�
+ *
* @param list
* @return
*/
public int updateExpire(List<Long> list);
+ /**
+ * 涓�绾ф煡璇�
+ *
+ * @param start
+ * @param count
+ * @param uid
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ public List<ThreeSale> listFirstTeamQuery(long start, int count, Long uid, Integer state, String startTime,
+ String endTime);
+
+ public long countFirstTeamQuery(Long uid, Integer state, String startTime, String endTime);
+
+ /**
+ * 浜岀骇鏌ヨ
+ *
+ * @param start
+ * @param count
+ * @param uid
+ * @param startTime
+ * @param endTime
+ * @return
+ */
+ public List<ThreeSale> listSecondTeamQuery(long start, int count, Long uid, Integer state, String startTime,
+ String endTime);
+
+ public long countSecondTeamQuery(Long uid, Integer state, String startTime, String endTime);
+
+ /**
+ * 涓婄骇鏌ヨ
+ *
+ * @param start
+ * @param count
+ * @param uid
+ * @return
+ */
+ public List<ThreeSale> listSuperiorQuery(long start, int count, Integer state, Long uid);
+
+ public long countSuperiorQuery(Integer state, Long uid);
+
+
+ /**
+ * 缁熻鎵�鏈変竴绾ч槦鍛�
+ *
+ * @param uid
+ * @param state
+ * 鐘舵�侊紝鍊� 涓虹┖鏃跺垯缁熻鎵�鏈�
+ * @return
+ */
+ public long countFirstTeam(Long uid, Integer state);
+
+ /**
+ * 缁熻浜岀骇闃熷憳
+ *
+ * @param uid
+ * @param state
+ * 鐘舵�侊紝鍊� 涓虹┖鏃跺垯缁熻鎵�鏈�
+ * @return
+ */
+ public long countSecondTeam(Long uid, Integer state);
+
+ /**
+ * 鍓嶇鏌ヨ涓�绾ч槦鍛�
+ *
+ * @param start
+ * @param count
+ * @param uid
+ * @return
+ */
+ public JSONObject getMyFirstTeam(long start, int count, Long uid, Integer state);
+
+ /**
+ * 鍓嶇鏌ヨ浜岀骇闃熷憳
+ *
+ * @param start
+ * @param count
+ * @param uid
+ * @return
+ */
+ public JSONObject getMySecondTeam(long start, int count, Long uid, Integer state);
+
+ /**
+ * 鑾峰彇涓婄骇
+ *
+ * @param uid
+ * @return
+ */
+ public ThreeSale getMyBoss(Long uid);
+
+ public ThreeSale selectByPrimaryKey(Long id);
+
+ /**
+ * 鏌ヨ闃熷憳璁板綍 id+uid
+ *
+ * @param id
+ * @param uid
+ * @param expire
+ * 鏄惁澶辨晥鐘舵��
+ * @return
+ */
+ public List<ThreeSale> listbyIdAndBossId(Long id, Long uid, Integer expire);
+
+ /**
+ * 鏍规嵁閭�璇疯�呮煡璇㈠叧绯�
+ *
+ * @param workerId
+ * @return
+ */
+ public List<ThreeSale> listByWorkerId(Long workerId);
+
+ /**
+ * 鑾峰彇鎴愬姛閭�璇峰叧绯绘暟閲�
+ *
+ * @param uid
+ * @return
+ */
+ public int getSuccessRelationshipNum(Long uid);
+
+ /**
+ * 閭�璇风爜鐢熸垚涓婁笅绾у叧绯�
+ *
+ * @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);
+
}
--
Gitblit v1.8.0