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/money/UserMoneyDetailMapper.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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 4b127a7..cc086e4 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
@@ -21,7 +21,7 @@
* @return
*/
List<UserMoneyDetail> selectByUidWithIndexId(@Param("uid") Long uid, @Param("id") Long id,
- @Param("count") int count);
+ @Param("count") int count, @Param("type") Integer type);
/**
* 鑾峰彇鐢ㄦ埛鎬诲叡鏈夊灏戣褰曟暟鎹�
@@ -29,7 +29,7 @@
* @param uid
* @return
*/
- Long selectCountByUid(@Param("uid") Long uid);
+ Long selectCountByUid(@Param("uid") Long uid, @Param("type") Integer type);
/**
* 鎸夋渶澶х殑鍒涘缓鏃堕棿鍜岀敤鎴稩D妫�绱㈠垪琛�
@@ -39,7 +39,7 @@
* @return
*/
List<UserMoneyDetail> selectByMaxCreateTime(@Param("uid") Long uid, @Param("date") Date date,
- @Param("count") int count);
+ @Param("count") int count, @Param("type") Integer type);
/**
* 鎸夋渶澶х殑鍒涘缓鏃堕棿鍜岀敤鎴稩D妫�绱㈡暟閲�
@@ -48,7 +48,7 @@
* @param date
* @return
*/
- Long selectCountByUidAndMaxCreateTime(@Param("uid") Long uid, @Param("date") Date date);
+ Long selectCountByUidAndMaxCreateTime(@Param("uid") Long uid, @Param("date") Date date, @Param("type") Integer type);
/**
* 鎸夌敤鎴稩D鍜屾渶澶ф椂闂存绱㈡湀浠界殑鏁伴噺
@@ -57,7 +57,7 @@
* @param maxDate
* @return
*/
- int selectMonthCountByUid(@Param("uid") Long uid, @Param("date") Date maxDate);
+ int selectMonthCountByUid(@Param("uid") Long uid, @Param("date") Date maxDate, @Param("type") Integer type);
/**
* 缁熻鏌愪釜鏈堜唤鐨勬敹鍏ヤ笌鏀嚭
@@ -92,7 +92,7 @@
* @return
*/
BigDecimal getTotalMoneyByTypeAndUidWithDate(@Param("uid") Long uid, @Param("typeList") List<String> typeList,
- @Param("minDate") Date minDate, @Param("maxDate") Date maxDate);
+ @Param("minDate") Date minDate, @Param("maxDate") Date maxDate, @Param("show")Integer show);
/**
* 鏍规嵁绫诲瀷锛岀敤鎴稩D锛屽敮涓�鏍囪瘑鏌ヨ
@@ -104,4 +104,17 @@
UserMoneyDetail selectByTypeAndUidAndIdentifyCode(@Param("type") UserMoneyDetailTypeEnum type,
@Param("uid") Long uid, @Param("sourceIdentifyId") Long sourceIdentifyId);
+
+
+ /**
+ * 鏌ヨ鏄庣粏
+ * @param start
+ * @param count
+ * @param key
+ * @return
+ */
+ List<UserMoneyDetail> listQuery(@Param("start") long start, @Param("count") int count,
+ @Param("key") String key,@Param("keyType") Integer keyType);
+
+ Long countQuery(@Param("key") String key, @Param("keyType")Integer keyType);
}
\ No newline at end of file
--
Gitblit v1.8.0