From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ThreeSaleMapper.java |  102 +++++++++++++++++++++++++++++++-------------------
 1 files changed, 63 insertions(+), 39 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 d34144b..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
@@ -16,14 +16,13 @@
 	int insertSelective(ThreeSale record);
 
 	int updateByPrimaryKey(ThreeSale record);
-	
+
 	int updateByPrimaryKeySelective(ThreeSale record);
 
 	ThreeSale selectByPrimaryKey(Long id);
-	
-	
+
 	UserInfo selectBoss(Long uid);
-	
+
 	/**
 	 * 鏍规嵁琚個璇疯�匢D鏌ヨ
 	 * 
@@ -31,7 +30,6 @@
 	 * @return
 	 */
 	ThreeSale getByWorkerId(Long workerId);
-	
 
 	/**
 	 * 
@@ -39,7 +37,6 @@
 	 * @return
 	 */
 	ThreeSale getMyBoss(@Param("uid") Long uid);
-	
 
 	/**
 	 * 鏍规嵁涓嬬骇鏌ヨ鎴愬姛鐨勯個璇峰叧绯�
@@ -48,7 +45,6 @@
 	 */
 	ThreeSale selectSuccessByWorkerId(Long workerId);
 
-	
 	/**
 	 * 鏍规嵁閭�璇疯�匢D鏌ヨ鍏崇郴
 	 * 
@@ -56,8 +52,6 @@
 	 * @return
 	 */
 	List<ThreeSale> listByWorkerId(Long workerId);
-	
-	
 
 	/**
 	 * 涓�绾ф煡璇�-鍚庡彴鏌ヨ
@@ -73,8 +67,9 @@
 			@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("validState") Integer validState);
+	long countFirstTeamQuery(@Param("uid") Long uid, @Param("state") Integer state,
+			@Param("startTime") String startTime, @Param("endTime") String endTime,
+			@Param("validState") Integer validState);
 
 	/**
 	 * 浜岀骇鏌ヨ -鍚庡彴鏌ヨ
@@ -87,11 +82,12 @@
 	 * @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("validState") Integer validState);
+			@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("validState") Integer validState);
+			@Param("startTime") String startTime, @Param("endTime") String endTime,
+			@Param("validState") Integer validState);
 
 	/**
 	 * 涓婄骇鏌ヨ -鍚庡彴鏌ヨ
@@ -106,8 +102,6 @@
 
 	long countSuperiorQuery(@Param("state") Integer state, @Param("uid") Long uid);
 
-	
-	
 	/**
 	 * 鏌ヨ涓�绾ч槦鍛�
 	 * @param start
@@ -116,7 +110,7 @@
 	 * @return
 	 */
 	List<ThreeSale> listFirstTeam(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid,
-			@Param("listId")List<Long> listId);
+			@Param("listId") List<Long> listId);
 
 	/**
 	 * 鏌ヨ浜岀骇闃熷憳
@@ -126,22 +120,35 @@
 	 * @return
 	 */
 	List<ThreeSale> listSecondTeam(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid,
-			@Param("listId")List<Long> listId);
-	
+			@Param("listId") List<Long> listId);
+
 	/**
 	 * 缁熻涓�绾ч槦鍛�
 	 * @param uid
 	 * @return
 	 */
-	long countFirstTeam(@Param("uid") Long uid, @Param("listId")List<Long> listId);
-	
+	long countFirstTeam(@Param("uid") Long uid, @Param("listId") List<Long> listId);
+
 	/**
 	 * 缁熻浜岀骇闃熷憳
 	 * @param uid
 	 * @return
 	 */
-	long countSecondTeam(@Param("uid") Long uid, @Param("listId")List<Long> listId);
+	long countSecondTeam(@Param("uid") Long uid, @Param("listId") List<Long> listId);
 
+	/**
+	 * 缁熻涓�绾ч槦鍛�
+	 * @param uid
+	 * @return
+	 */
+	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鏌ヨ
@@ -152,7 +159,6 @@
 	 */
 	List<ThreeSale> listbyIdAndBossId(@Param("id") Long id, @Param("uid") Long uid, @Param("expire") Integer expire);
 
-	
 	/**
 	 * 鑾峰彇鎴愬姛閭�璇峰叧绯绘暟閲�
 	 * 
@@ -160,8 +166,7 @@
 	 * @return
 	 */
 	int getSuccessRelationshipNum(@Param("uid") Long uid);
-	
-	
+
 	/**
 	 * 鏍规嵁閭�璇疯�匢D銆乥ossID鏌ヨ 鏈夋晥鍏崇郴
 	 * 
@@ -169,8 +174,7 @@
 	 * @return
 	 */
 	ThreeSale getRelationshipByBossIdAndWorkerId(@Param("bossId") Long bossId, @Param("workerId") Long workerId);
-	
-	
+
 	/**
 	 * 鏈�鍚庝竴娆″叧绯昏褰� -鏃犺
 	 * @param bossId
@@ -178,9 +182,7 @@
 	 * @return
 	 */
 	ThreeSale getNearRelationByBossIdAndWorkerId(@Param("bossId") Long bossId, @Param("workerId") Long workerId);
-	
-	
-	
+
 	/**
 	 * 鏌ヨ鏃堕棿娈甸個璇锋垚鍔熶汉淇℃伅
 	 * @param bossId
@@ -188,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
@@ -205,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