From ee1d39f11b9483b64a88029f1755a6e7166fea15 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期日, 26 四月 2020 16:49:21 +0800
Subject: [PATCH] 等级显示问题

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ThreeSaleMapper.java |  170 +++++++++++++++++---------------------------------------
 1 files changed, 51 insertions(+), 119 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 d2ad37d..dd9cefb 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,38 +15,52 @@
 
 	int insertSelective(ThreeSale record);
 
-	ThreeSale selectByPrimaryKey(Long id);
-
-	UserInfo selectBoss(Long uid);
-
-	List<ThreeSale> selectByUid(Long uid);
-
+	int updateByPrimaryKey(ThreeSale record);
+	
 	int updateByPrimaryKeySelective(ThreeSale record);
 
-	int updateByPrimaryKey(ThreeSale record);
-
-	int effectThreeSale(Long workerUid);
+	ThreeSale selectByPrimaryKey(Long id);
+	
+	
+	UserInfo selectBoss(Long uid);
 	
 	/**
-	 * 鍒犻櫎澶辨晥
-	 * @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 workerId
+	 * @return
+	 */
+	List<ThreeSale> listByWorkerId(Long workerId);
+	
 	
 
-
 	/**
-	 * 涓�绾ф煡璇�
+	 * 涓�绾ф煡璇�-鍚庡彴鏌ヨ
 	 * 
 	 * @param start
 	 * @param count
@@ -63,7 +77,7 @@
 			@Param("endTime") String endTime, @Param("validState") Integer validState);
 
 	/**
-	 * 浜岀骇鏌ヨ
+	 * 浜岀骇鏌ヨ -鍚庡彴鏌ヨ
 	 * 
 	 * @param start
 	 * @param count
@@ -80,7 +94,7 @@
 			@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("validState") Integer validState);
 
 	/**
-	 * 涓婄骇鏌ヨ
+	 * 涓婄骇鏌ヨ -鍚庡彴鏌ヨ
 	 * 
 	 * @param start
 	 * @param count
@@ -92,97 +106,40 @@
 
 	long countSuperiorQuery(@Param("state") Integer state, @Param("uid") Long uid);
 
+	
+	
 	/**
 	 * 鏌ヨ涓�绾ч槦鍛�
-	 * 
-	 * @param paramLong
-	 * @param paramInt
-	 * @param paramLong1
+	 * @param start
+	 * @param count
+	 * @param uid
 	 * @return
 	 */
-	List<ThreeSale> listFirstTeam(@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 start
+	 * @param count
+	 * @param uid
+	 * @return
+	 */
+	List<ThreeSale> listSecondTeam(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid);
+	
 	/**
 	 * 缁熻涓�绾ч槦鍛�
-	 * 
-	 * @param uid
-	 * @param state
-	 * @return
-	 */
-	long countFirstTeam(@Param("uid") Long uid, @Param("state") Integer state);
-	
-	
-	/**
-	 * 鏌ヨ涓�绾ч槦鍛�-鏈垹闄ょ増
-	 * 
-	 * @param paramLong
-	 * @param paramInt
-	 * @param paramLong1
-	 * @return
-	 */
-	List<ThreeSale> listFirstTeamByUndeleted(@Param("start") long start, @Param("count") int count,  @Param("uid") Long uid);
-
-	/**
-	 * 缁熻涓�绾ч槦鍛� -鏈垹闄ょ増
-	 * 
-	 * @param uid
-	 * @param state
-	 * @return
-	 */
-	long countFirstTeamByUndeleted(@Param("uid") Long uid);
-
-	
-	
-	/**
-	 * 鏌ヨ浜岀骇闃熷憳
-	 * 
-	 * @param start
-	 * @param count
 	 * @param uid
 	 * @return
 	 */
-	List<ThreeSale> listSecondTeamByUndeleted(@Param("start") long start, @Param("count") int count,
-			@Param("uid") Long uid);
-
+	long countFirstTeam(@Param("uid") Long uid);
+	
 	/**
 	 * 缁熻浜岀骇闃熷憳
-	 * 
 	 * @param uid
-	 * @param state
 	 * @return
 	 */
-	long countSecondTeamByUndeleted(@Param("uid") Long uid);
-	
-	
-	
+	long countSecondTeam(@Param("uid") Long uid);
 
-	/**
-	 * 鏌ヨ浜岀骇闃熷憳
-	 * 
-	 * @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);
-
-	/**
-	 * 缁熻浜岀骇闃熷憳
-	 * 
-	 * @param uid
-	 * @param state
-	 * @return
-	 */
-	long countSecondTeam(@Param("uid") Long uid, @Param("state") Integer state);
-
-	/**
-	 * 
-	 * @param uid
-	 * @return
-	 */
-	ThreeSale getMyBoss(@Param("uid") Long uid);
 
 	/**
 	 * 鏍规嵁id銆乽id鏌ヨ
@@ -193,14 +150,6 @@
 	 */
 	List<ThreeSale> listbyIdAndBossId(@Param("id") Long id, @Param("uid") Long uid, @Param("expire") Integer expire);
 
-	/**
-	 * 鏍规嵁閭�璇疯�匢D鏌ヨ鍏崇郴
-	 * 
-	 * @param workerId
-	 * @return
-	 */
-	List<ThreeSale> listByWorkerId(Long workerId);
-	
 	
 	/**
 	 * 鑾峰彇鎴愬姛閭�璇峰叧绯绘暟閲�
@@ -228,23 +177,6 @@
 	 */
 	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);
 	
 	
 	/**

--
Gitblit v1.8.0