From 117bb1c6a02d99546dd4bf953aeec67b1ab3d94e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 29 十二月 2018 14:52:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/UserMoneyDetailMapper.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/UserMoneyDetailMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/UserMoneyDetailMapper.java
index 4e8a4c5..f3b0035 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/UserMoneyDetailMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/UserMoneyDetailMapper.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.dao.mybatis.money;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -36,7 +37,8 @@
* @param date
* @return
*/
- List<UserMoneyDetail> selectByMaxCreateTime(@Param("uid") Long uid, @Param("date") Date date,@Param("count") int count);
+ List<UserMoneyDetail> selectByMaxCreateTime(@Param("uid") Long uid, @Param("date") Date date,
+ @Param("count") int count);
/**
* 鎸夋渶澶х殑鍒涘缓鏃堕棿鍜岀敤鎴稩D妫�绱㈡暟閲�
@@ -65,4 +67,30 @@
*/
List<UserMonthMoneyVO> selectMonthMoneyByUid(@Param("uid") Long uid, @Param("dateFormat") List<String> dateFormat);
+ /**
+ * 鏍规嵁鐢ㄦ埛ID鑾峰彇璧勯噾鏄庣粏锛堣�佺増锛�
+ *
+ * @param uid
+ * @param start
+ * @param count
+ * @return
+ */
+
+ List<UserMoneyDetail> selectByUidWithState(@Param("uid") Long uid, @Param("start") long start,
+ @Param("count") int count);
+
+ Long selectCountByUidWithState(@Param("uid") Long uid);
+
+ /**
+ * 缁熻鏌愪釜鐢ㄦ埛鏌愭鏃堕棿鍐呬骇鐢熺殑鏄庣粏涔嬪拰
+ *
+ * @param uid
+ * @param typeList
+ * @param minDate
+ * @param maxDate
+ * @return
+ */
+ BigDecimal getTotalMoneyByTypeAndUidWithDate(@Param("uid") Long uid, @Param("typeList") List<String> typeList,
+ @Param("minDate") Date minDate, @Param("maxDate") Date maxDate);
+
}
\ No newline at end of file
--
Gitblit v1.8.0