From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java | 68 +++++++++++++++++++++++++++++-----
1 files changed, 58 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java
index b20b213..4f41797 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java
@@ -23,6 +23,13 @@
List<HongBaoV2> listChildrenById(Long id);
/**
+ * 鑾峰彇瀛愮孩鍖呭垪琛�
+ * @param idList
+ * @return
+ */
+ List<HongBaoV2> listChildrenByIds(@Param("idList") List<Long> idList);
+
+ /**
* 鑾峰彇濂栭噾鍒楄〃锛�1.4.9涔嬪墠锛�
*
* @param uid
@@ -112,12 +119,16 @@
List<HongBaoV2> listCanBalanceHongBaoByType(@Param("type") int type, @Param("count") int count);
/**
- * 鑾峰彇鑳藉缁撶畻鐨勫垎浜禋鍜岄個璇疯禋鐨勭敤鎴峰垪琛�
+ * 鑾峰彇鑳藉缁撶畻鐨勭孩鍖呯殑鐢ㄦ埛鍒楄〃
*
* @param count
* @return
*/
- List<Long> listUidCanBanlanceShareAndInvite(int count);
+ List<Long> listUidCanBanlanceByTypeAndMaxTime(@Param("typeList") List<Integer> typeList,
+ @Param("maxTime") Date maxTime, @Param("start") long start, @Param("count") int count);
+
+ long countUidCanBanlanceByTypeAndMaxTime(@Param("typeList") List<Integer> typeList,
+ @Param("maxTime") Date maxTime);
/**
* 鏍规嵁鐢ㄦ埛ID锛岀被鍨嬭幏鍙栬兘澶熺粨绠楃殑绾㈠寘
@@ -127,16 +138,19 @@
* @param count
* @return
*/
- List<HongBaoV2> listCanBalanceHongBaoByTypeAndUid(@Param("types") List<Integer> type, @Param("uid") Long uid,@Param("start") long start,
+ List<HongBaoV2> listCanBalanceHongBaoByTypeAndUid(@Param("types") List<Integer> type, @Param("uid") Long uid,
+ @Param("orderType") Integer orderType, @Param("maxDate") Date maxPreGetTime, @Param("start") long start,
@Param("count") int count);
-
+
/**
* 璁＄畻鍙互缁撶畻绾㈠寘鐨勬暟閲�
+ *
* @param type
* @param uid
* @return
*/
- long countCanBalanceHongBaoByTypeAndUid(@Param("types") List<Integer> type, @Param("uid") Long uid);
+ long countCanBalanceHongBaoByTypeAndUid(@Param("types") List<Integer> type, @Param("uid") Long uid,
+ @Param("orderType") Integer orderType, @Param("maxDate") Date maxPreGetTime);
/**
* 鏍规嵁鐢ㄦ埛ID锛岃鍗曠姸鎬佸拰缁撶畻鏃堕棿缁熻閭�璇疯禋鐨勮鍗曟暟閲�
@@ -147,7 +161,7 @@
* @return
*/
Long countInviteOrderCountByUidAndSettleTime(@Param("uid") Long uid, @Param("state") int state,
- @Param("minDate") Date minDate, @Param("maxDate") Date maxDate);
+ @Param("minDate") Date minDate, @Param("maxDate") Date maxDate, @Param("orderType") int orderType);
/**
* 鏍规嵁鐢ㄦ埛ID锛岃鍗曠姸鎬佸拰缁撶畻鏃堕棿缁熻鍒嗕韩璧氱殑璁㈠崟鏁伴噺
@@ -158,7 +172,7 @@
* @return
*/
Long countShareOrderCountByUidAndSettleTime(@Param("uid") Long uid, @Param("state") int state,
- @Param("minDate") Date minDate, @Param("maxDate") Date maxDate);
+ @Param("minDate") Date minDate, @Param("maxDate") Date maxDate, @Param("orderType") Integer orderType);
/**
* 閫氳繃鐢ㄦ埛ID鍜岀姸鎬佹煡璇㈡暟閲�
@@ -206,14 +220,48 @@
*/
long countByParentUidAndTypeAndState(@Param("uid") Long uid, @Param("typeList") List<Integer> typeList,
@Param("stateList") List<Integer> stateList);
-
-
+
/**
* 鏍规嵁璁㈠崟鏉ユ簮绫诲瀷涓庝氦鏄揑D鍒楄〃鏌ヨ璁㈠崟淇℃伅
+ *
* @param sourceType
* @param tradeId
* @return
*/
- List<HongBaoV2> listBySourceTypeAndTradeIdListAndUid(@Param("sourceType") int sourceType, @Param("uid")long uid, @Param("tradeIdList") List<String> tradeIdList);
+ List<HongBaoV2> listBySourceTypeAndTradeIdListAndUid(@Param("sourceType") int sourceType, @Param("uid") long uid,
+ @Param("tradeIdList") List<String> tradeIdList);
+
+ /**
+ * 鏍规嵁鐘舵�侊紝绫诲瀷锛岀敤鎴稩D妫�绱�
+ * @param stateList
+ * @param typeList
+ * @param uid
+ * @return
+ */
+ List<HongBaoV2> listByStateAndTypeAndUid(@Param("stateList") List<Integer> stateList,
+ @Param("typeList") List<Integer> typeList, @Param("uid") Long uid, @Param("start") long start,
+ @Param("count") int count);
+
+ /**
+ * 鏍规嵁ID鎵归噺鏌ヨ
+ * @param idList
+ * @return
+ */
+ List<HongBaoV2> listByIds(@Param("idList") List<Long> idList);
+
+ /**
+ * 鏍规嵁璁㈠崟浜ゆ槗id鏌ヨ绾㈠寘
+ * @param idList
+ * @return
+ */
+ List<HongBaoDTO> listByOrderTradeId(@Param("tradeId") String tradeId);
+
+
+ /**
+ * 鏌ヨ鐩存帴涓婄骇褰撴椂鑾峰緱绾㈠寘绛夌骇
+ * @param pid
+ * @return
+ */
+ Integer getDirectBossUrankByPid(@Param("pid")Long pid);
}
\ No newline at end of file
--
Gitblit v1.8.0