From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:28:03 +0800
Subject: [PATCH] Merge branch 'div_12'
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ThreeSaleMapper.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 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 79fa954..c2d5255 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
@@ -26,6 +26,23 @@
int updateByPrimaryKey(ThreeSale record);
int effectThreeSale(Long workerUid);
+
+ /**
+ * 鍒犻櫎澶辨晥
+ * @param bossId
+ * @param workerId
+ * @return
+ */
+ int deleteExpireRecord(@Param("bossId")Long bossId, @Param("workerId")Long workerId);
+
+ /**
+ * 澶辨晥
+ * @param bossId
+ * @param workerId
+ * @return
+ */
+ List<ThreeSale> getExpireRecord(@Param("bossId")Long bossId, @Param("workerId")Long workerId);
+
/**
* 鏌ヨ涓�搴﹂槦鍛橀泦鍚�
@@ -132,7 +149,8 @@
* @param paramLong1
* @return
*/
- List<ThreeSale> listFirstTeam(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid);
+ List<ThreeSale> listFirstTeam(@Param("start") long start, @Param("count") int count,
+ @Param("uid") Long uid, @Param("state") Integer state);
/**
* 缁熻涓�绾ч槦鍛�
@@ -151,7 +169,8 @@
* @param uid
* @return
*/
- List<ThreeSale> listSecondTeam(@Param("start") long start, @Param("count") int count, @Param("uid") Long uid);
+ List<ThreeSale> listSecondTeam(@Param("start") long start, @Param("count") int count,
+ @Param("uid") Long uid,@Param("state") Integer state);
/**
* 缁熻浜岀骇闃熷憳
@@ -204,5 +223,19 @@
*/
ThreeSale getRelationshipByBossIdAndWorkerId(@Param("bossId") Long bossId, @Param("workerId") Long workerId);
+ /**
+ * 鏍规嵁涓嬬骇鏌ヨ鎴愬姛鐨勯個璇峰叧绯�
+ * @param workerId
+ * @return
+ */
+ ThreeSale selectSuccessByWorkerId(Long workerId);
+
+ /**
+ * 鏍规嵁閭�璇疯�匢D鏌ヨ鏈け鏁堝叧绯�
+ *
+ * @param workerId
+ * @return
+ */
+ ThreeSale getByWorkerId(Long workerId);
}
\ No newline at end of file
--
Gitblit v1.8.0