From 505d8e50a24a22cda05d04da8485ccc87fe8761e Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 15 八月 2019 16:02: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 | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 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 c47aa81..ec60251 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
@@ -140,8 +140,7 @@
*/
Long countInviteOrderCountByUidAndSettleTime(@Param("uid") Long uid, @Param("state") int state,
@Param("minDate") Date minDate, @Param("maxDate") Date maxDate);
-
-
+
/**
* 鏍规嵁鐢ㄦ埛ID锛岃鍗曠姸鎬佸拰缁撶畻鏃堕棿缁熻鍒嗕韩璧氱殑璁㈠崟鏁伴噺
*
@@ -169,12 +168,35 @@
* @param stateList
* @return
*/
- BigDecimal computeMoneyByUidAndState(@Param("uid") Long uid,@Param("stateList") List<Integer> stateList);
-
+ BigDecimal computeMoneyByUidAndState(@Param("uid") Long uid, @Param("stateList") List<Integer> stateList);
+
/**
* 鏈�杩�30澶╁唴浜х敓杩囧垎浜鍗曠殑鐢ㄦ埛
+ *
* @return
*/
List<Long> getUidByNear30DayShareSucceed();
-
+
+ /**
+ * 鏍规嵁鐖剁敤鎴稩D锛岀姸鎬侊紝绫诲瀷鏌ヨ
+ *
+ * @param uid
+ * @param typeList
+ * @param stateList
+ * @return
+ */
+ List<HongBaoV2> listByParentUidAndTypeAndState(@Param("uid") Long uid, @Param("typeList") List<Integer> typeList,
+ @Param("stateList") List<Integer> stateList, @Param("start") long start, @Param("count") int count);
+
+ /**
+ * 鏍规嵁鐖剁敤鎴稩D锛岀姸鎬侊紝绫诲瀷鏌ヨ鏁伴噺
+ *
+ * @param uid
+ * @param typeList
+ * @param stateList
+ * @return
+ */
+ long countByParentUidAndTypeAndState(@Param("uid") Long uid, @Param("typeList") List<Integer> typeList,
+ @Param("stateList") List<Integer> stateList);
+
}
\ No newline at end of file
--
Gitblit v1.8.0