From bf5c02aaecb3f7a42daa4fa356c62a2e6bca0db5 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 28 十月 2019 09:55:59 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 c8b30c3..2d46519 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,12 @@
List<HongBaoV2> listChildrenById(Long id);
/**
+ * 鑾峰彇瀛愮孩鍖呭垪琛�
+ * @param idList
+ * @return
+ */
+ List<HongBaoV2> listChildrenByIds(@Param("idList") List<Long> idList);
+ /**
* 鑾峰彇濂栭噾鍒楄〃锛�1.4.9涔嬪墠锛�
*
* @param uid
@@ -127,7 +133,7 @@
* @param count
* @return
*/
- List<HongBaoV2> listCanBalanceHongBaoByTypeAndUid(@Param("types") List<Integer> type, @Param("uid") Long uid,
+ List<HongBaoV2> listCanBalanceHongBaoByTypeAndUid(@Param("types") List<Integer> type, @Param("uid") Long uid, @Param("orderType") Integer orderType,
@Param("start") long start, @Param("count") int count);
/**
@@ -137,7 +143,7 @@
* @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);
/**
* 鏍规嵁鐢ㄦ埛ID锛岃鍗曠姸鎬佸拰缁撶畻鏃堕棿缁熻閭�璇疯禋鐨勮鍗曟暟閲�
@@ -227,5 +233,13 @@
*/
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);
}
\ No newline at end of file
--
Gitblit v1.8.0