From 2ff38cf4200a2235567e8ff6f5560a7026e1f1a6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 23 四月 2020 14:08:56 +0800
Subject: [PATCH] 返利比例兼容
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/ThreeSaleMapper.java | 108 ++++++++++++++++++++++++++----------------------------
1 files changed, 52 insertions(+), 56 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..d2ad37d 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
@@ -44,57 +44,6 @@
List<ThreeSale> getExpireRecord(@Param("bossId")Long bossId, @Param("workerId")Long workerId);
- /**
- * 鏌ヨ涓�搴﹂槦鍛橀泦鍚�
- *
- * @param start
- * @param count
- * @param key
- * @param uid
- * @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);
-
- /**
- * 鏌ヨ浜屽害闃熷憳闆嗗悎
- *
- * @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);
/**
* 涓�绾ф煡璇�
@@ -107,10 +56,11 @@
* @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);
+ long countFirstTeamQuery(@Param("uid") Long uid, @Param("state") Integer state, @Param("startTime") String startTime,
+ @Param("endTime") String endTime, @Param("validState") Integer validState);
/**
* 浜岀骇鏌ヨ
@@ -123,10 +73,11 @@
* @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);
/**
* 涓婄骇鏌ヨ
@@ -160,6 +111,51 @@
* @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);
+
+ /**
+ * 缁熻浜岀骇闃熷憳
+ *
+ * @param uid
+ * @param state
+ * @return
+ */
+ long countSecondTeamByUndeleted(@Param("uid") Long uid);
+
+
+
/**
* 鏌ヨ浜岀骇闃熷憳
--
Gitblit v1.8.0