From a3e1aec60d2f886b8c48966c889b567719d0c5ea Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 16 十月 2019 16:50:25 +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 | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 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..c8b30c3 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
@@ -127,11 +127,12 @@
* @param count
* @return
*/
- List<HongBaoV2> listCanBalanceHongBaoByTypeAndUid(@Param("types") List<Integer> type, @Param("uid") Long uid,@Param("start") long start,
- @Param("count") int count);
-
+ List<HongBaoV2> listCanBalanceHongBaoByTypeAndUid(@Param("types") List<Integer> type, @Param("uid") Long uid,
+ @Param("start") long start, @Param("count") int count);
+
/**
* 璁＄畻鍙互缁撶畻绾㈠寘鐨勬暟閲�
+ *
* @param type
* @param uid
* @return
@@ -206,14 +207,25 @@
*/
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);
}
\ No newline at end of file
--
Gitblit v1.8.0