From 9d6cbe54651bd3951036e611eabd47a713c91a86 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 26 五月 2020 12:34:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ThreeSaleMapper.java |  232 +++++++++++++++++++++++----------------------------------
 1 files changed, 93 insertions(+), 139 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ThreeSaleMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ThreeSaleMapper.java
index 3c50888..a0e5ef6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ThreeSaleMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ThreeSaleMapper.java
@@ -15,89 +15,46 @@
 
 	int insertSelective(ThreeSale record);
 
+	int updateByPrimaryKey(ThreeSale record);
+
+	int updateByPrimaryKeySelective(ThreeSale record);
+
 	ThreeSale selectByPrimaryKey(Long id);
 
 	UserInfo selectBoss(Long uid);
 
-	List<ThreeSale> selectByUid(Long uid);
-
-	int updateByPrimaryKeySelective(ThreeSale record);
-
-	int updateByPrimaryKey(ThreeSale record);
-
-	int effectThreeSale(Long workerUid);
-	
 	/**
-	 * 鍒犻櫎澶辨晥
-	 * @param bossId
+	 * 鏍规嵁琚個璇疯�匢D鏌ヨ
+	 * 
 	 * @param workerId
 	 * @return
 	 */
-	int deleteExpireRecord(@Param("bossId")Long bossId, @Param("workerId")Long workerId);
-	
+	ThreeSale getByWorkerId(Long workerId);
+
 	/**
-	 * 澶辨晥
-	 * @param bossId
+	 * 
+	 * @param uid
+	 * @return
+	 */
+	ThreeSale getMyBoss(@Param("uid") Long uid);
+
+	/**
+	 * 鏍规嵁涓嬬骇鏌ヨ鎴愬姛鐨勯個璇峰叧绯�
 	 * @param workerId
 	 * @return
 	 */
-	List<ThreeSale> getExpireRecord(@Param("bossId")Long bossId, @Param("workerId")Long workerId);
-	
+	ThreeSale selectSuccessByWorkerId(Long workerId);
 
 	/**
-	 * 鏌ヨ涓�搴﹂槦鍛橀泦鍚�
+	 * 鏍规嵁閭�璇疯�匢D鏌ヨ鍏崇郴
 	 * 
-	 * @param start
-	 * @param count
-	 * @param key
-	 * @param uid
+	 * @param workerId
 	 * @return
 	 */
-	List<ThreeSale> queryMyFirstTeamList(@Param("start") int start, @Param("count") int count, @Param("key") String key,
-			@Param("bossId") Long bossId);
-
-	long queryCountMyFirstTeamList(@Param("key") String key, @Param("bossId") Long bossId);
+	List<ThreeSale> listByWorkerId(Long workerId);
 
 	/**
-	 * 鏌ヨ浜屽害闃熷憳闆嗗悎
-	 * 
-	 * @param start
-	 * @param count
-	 * @param key
-	 * @param uid
-	 * @return
-	 */
-	List<ThreeSale> queryMySecondTeamList(@Param("start") int start, @Param("count") int count,
-			@Param("key") String key, @Param("bossId") Long bossId);
-
-	long queryCountMySecondTeamList(@Param("key") String key, @Param("bossId") Long bossId);
-
-	/**
-	 * 闀挎椂闂存湭閭�璇锋垚鍔熺敤鎴�
-	 * 
-	 * @param daysNum
-	 * @return
-	 */
-	List<Long> queryLongTimeFailed(@Param("daysNum") int daysNum);
-
-	/**
-	 * 闀挎椂闂� 閭�璇锋垚鍔熺敤鎴�
-	 * 
-	 * @param daysNum
-	 * @return
-	 */
-	List<ThreeSale> queryLongTimeSuccess(@Param("daysNum") int daysNum);
-
-	/**
-	 * 璁剧疆瀵瑰簲閭�璇疯繃鏈�
-	 * 
-	 * @param list
-	 * @return
-	 */
-	int updateExpire(List<Long> list);
-
-	/**
-	 * 涓�绾ф煡璇�
+	 * 涓�绾ф煡璇�-鍚庡彴鏌ヨ
 	 * 
 	 * @param start
 	 * @param count
@@ -107,13 +64,15 @@
 	 * @return
 	 */
 	List<ThreeSale> listFirstTeamQuery(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid,
-			@Param("state") Integer state, @Param("startTime") String startTime, @Param("endTime") String endTime);
+			@Param("state") Integer state, @Param("startTime") String startTime, @Param("endTime") String endTime,
+			@Param("validState") Integer validState);
 
 	long countFirstTeamQuery(@Param("uid") Long uid, @Param("state") Integer state,
-			@Param("startTime") String startTime, @Param("endTime") String endTime);
+			@Param("startTime") String startTime, @Param("endTime") String endTime,
+			@Param("validState") Integer validState);
 
 	/**
-	 * 浜岀骇鏌ヨ
+	 * 浜岀骇鏌ヨ -鍚庡彴鏌ヨ
 	 * 
 	 * @param start
 	 * @param count
@@ -123,13 +82,15 @@
 	 * @return
 	 */
 	List<ThreeSale> listSecondTeamQuery(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid,
-			@Param("state") Integer state, @Param("startTime") String startTime, @Param("endTime") String endTime);
+			@Param("state") Integer state, @Param("startTime") String startTime, @Param("endTime") String endTime,
+			@Param("validState") Integer validState);
 
 	long countSecondTeamQuery(@Param("uid") Long uid, @Param("state") Integer state,
-			@Param("startTime") String startTime, @Param("endTime") String endTime);
+			@Param("startTime") String startTime, @Param("endTime") String endTime,
+			@Param("validState") Integer validState);
 
 	/**
-	 * 涓婄骇鏌ヨ
+	 * 涓婄骇鏌ヨ -鍚庡彴鏌ヨ
 	 * 
 	 * @param start
 	 * @param count
@@ -143,50 +104,51 @@
 
 	/**
 	 * 鏌ヨ涓�绾ч槦鍛�
-	 * 
-	 * @param paramLong
-	 * @param paramInt
-	 * @param paramLong1
-	 * @return
-	 */
-	List<ThreeSale> listFirstTeam(@Param("start") long start, @Param("count") int count, 
-			@Param("uid") Long uid, @Param("state") Integer state);
-
-	/**
-	 * 缁熻涓�绾ч槦鍛�
-	 * 
-	 * @param uid
-	 * @param state
-	 * @return
-	 */
-	long countFirstTeam(@Param("uid") Long uid, @Param("state") Integer state);
-
-	/**
-	 * 鏌ヨ浜岀骇闃熷憳
-	 * 
 	 * @param start
 	 * @param count
 	 * @param uid
 	 * @return
 	 */
-	List<ThreeSale> listSecondTeam(@Param("start") long start, @Param("count") int count,
-			@Param("uid") Long uid,@Param("state") Integer state);
+	List<ThreeSale> listFirstTeam(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid,
+			@Param("listId") List<Long> listId);
+
+	/**
+	 * 鏌ヨ浜岀骇闃熷憳
+	 * @param start
+	 * @param count
+	 * @param uid
+	 * @return
+	 */
+	List<ThreeSale> listSecondTeam(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid,
+			@Param("listId") List<Long> listId);
+
+	/**
+	 * 缁熻涓�绾ч槦鍛�
+	 * @param uid
+	 * @return
+	 */
+	long countFirstTeam(@Param("uid") Long uid, @Param("listId") List<Long> listId);
 
 	/**
 	 * 缁熻浜岀骇闃熷憳
-	 * 
 	 * @param uid
-	 * @param state
 	 * @return
 	 */
-	long countSecondTeam(@Param("uid") Long uid, @Param("state") Integer state);
+	long countSecondTeam(@Param("uid") Long uid, @Param("listId") List<Long> listId);
 
 	/**
-	 * 
+	 * 缁熻涓�绾ч槦鍛�
 	 * @param uid
 	 * @return
 	 */
-	ThreeSale getMyBoss(@Param("uid") Long uid);
+	long countFirstTeamByDate(@Param("uid") Long uid, @Param("dayType") int dayType);
+
+	/**
+	 * 缁熻浜岀骇闃熷憳
+	 * @param uid
+	 * @return
+	 */
+	long countSecondTeamByDate(@Param("uid") Long uid, @Param("dayType") int dayType);
 
 	/**
 	 * 鏍规嵁id銆乽id鏌ヨ
@@ -198,23 +160,13 @@
 	List<ThreeSale> listbyIdAndBossId(@Param("id") Long id, @Param("uid") Long uid, @Param("expire") Integer expire);
 
 	/**
-	 * 鏍规嵁閭�璇疯�匢D鏌ヨ鍏崇郴
-	 * 
-	 * @param workerId
-	 * @return
-	 */
-	List<ThreeSale> listByWorkerId(Long workerId);
-	
-	
-	/**
 	 * 鑾峰彇鎴愬姛閭�璇峰叧绯绘暟閲�
 	 * 
 	 * @param uid
 	 * @return
 	 */
 	int getSuccessRelationshipNum(@Param("uid") Long uid);
-	
-	
+
 	/**
 	 * 鏍规嵁閭�璇疯�匢D銆乥ossID鏌ヨ 鏈夋晥鍏崇郴
 	 * 
@@ -222,8 +174,7 @@
 	 * @return
 	 */
 	ThreeSale getRelationshipByBossIdAndWorkerId(@Param("bossId") Long bossId, @Param("workerId") Long workerId);
-	
-	
+
 	/**
 	 * 鏈�鍚庝竴娆″叧绯昏褰� -鏃犺
 	 * @param bossId
@@ -231,26 +182,7 @@
 	 * @return
 	 */
 	ThreeSale getNearRelationByBossIdAndWorkerId(@Param("bossId") Long bossId, @Param("workerId") Long workerId);
-	
-	
-	
-	/**
-	 * 鏍规嵁涓嬬骇鏌ヨ鎴愬姛鐨勯個璇峰叧绯�
-	 * @param workerId
-	 * @return
-	 */
-	ThreeSale selectSuccessByWorkerId(Long workerId);
-	
 
-	/**
-	 * 鏍规嵁閭�璇疯�匢D鏌ヨ鏈け鏁堝叧绯�
-	 * 
-	 * @param workerId
-	 * @return
-	 */
-	ThreeSale getByWorkerId(Long workerId);
-	
-	
 	/**
 	 * 鏌ヨ鏃堕棿娈甸個璇锋垚鍔熶汉淇℃伅
 	 * @param bossId
@@ -258,16 +190,17 @@
 	 * @param maxTime
 	 * @return
 	 */
-	List<ThreeSale> getSuccessByDate(@Param("bossId")Long bossId,@Param("minTime")Long minTime, @Param("maxTime")Long maxTime);
-	
+	List<ThreeSale> getSuccessByDate(@Param("bossId") Long bossId, @Param("minTime") Long minTime,
+			@Param("maxTime") Long maxTime);
+
 	/**
 	 * 鏌ヨ鏈�杩戠殑淇℃伅锛堟牴鎹笅绾D涓庣姸鎬侊級
 	 * @param workerId
 	 * @param state
 	 * @return
 	 */
-	ThreeSale selectLatestByWorkerIdAndState(@Param("workerId") Long workerId,@Param("state") int state);
-	
+	ThreeSale selectLatestByWorkerIdAndState(@Param("workerId") Long workerId, @Param("state") int state);
+
 	/**
 	 * 鏍规嵁鏃堕棿鏌ヨ閭�璇峰叧绯�
 	 * @param uid
@@ -275,28 +208,49 @@
 	 * @return
 	 */
 	ThreeSale getByWorkerIdAndTime(@Param("workerId") Long workerId, @Param("time") long time);
-	
+
 	/**
 	 * 閭�璇峰叧绯昏劚绂�
 	 * @param bossId
 	 * @param workerId
 	 */
-	void inviteSeparate(@Param("workerId") Long workerId, @Param("bossId")Long bossId);
-	
+	void inviteSeparate(@Param("workerId") Long workerId, @Param("bossId") Long bossId);
+
 	/**
 	 * 闃熷憳鍦ㄨboss 涓嬬鍑犱釜闃熷憳搴忓彿
 	 * @param workerId
 	 * @return
 	 */
 	long getTeamOrderNumByWorkerId(@Param("workerId") Long workerId);
-	
+
 	/**
 	 * 鏈夋晥绮変笣uid
 	 * @param bossId
 	 * @param limitTime
 	 * @return
 	 */
-	List<ThreeSale> getValidWorkerIdsByTime(@Param("uid") Long uid,@Param("limitTime") long limitTime);
+	List<ThreeSale> getValidWorkerIdsByTime(@Param("uid") Long uid, @Param("limitTime") long limitTime);
+
+	/**
+	 * 鏌ヨ鎵�鏈夊垪琛�
+	 * @Title: listAll
+	 * @Description: 
+	 * @param start
+	 * @param count
+	 * @return 
+	 * List<ThreeSale> 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	List<ThreeSale> listAll(@Param("minTime") Long minTime, @Param("maxTime") Long maxTime, @Param("start") long start,
+			@Param("count") int count);
+
+	long countAll(@Param("minTime") Long minTime, @Param("maxTime") Long maxTime);
 	
 	
+	/**
+	 * 鏌ヨ鎵�鏈塨ossID
+	 * @return
+	 */
+	List<Long> getAllBossId();
+
 }
\ No newline at end of file

--
Gitblit v1.8.0