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/service/inter/money/UserMoneyDetailService.java |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/money/UserMoneyDetailService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/money/UserMoneyDetailService.java
index 70f67de..c6770eb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/money/UserMoneyDetailService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/money/UserMoneyDetailService.java
@@ -33,7 +33,7 @@
 	 * @param maxTime
 	 * @return
 	 */
-	public List<UserMoneyDetailHistoryVO> listUserMoneyDetailForClient(Long uid, Long userMoneyDetailId, Date maxTime);
+	public List<UserMoneyDetailHistoryVO> listUserMoneyDetailForClient(Long uid, Long userMoneyDetailId, Integer type, Date maxTime);
 
 	/**
 	 * 瀹㈡埛绔煡璇㈢敤鎴风殑璧勯噾璁板綍鐨勬潯鏁帮紙璁＄畻鏈堢粺璁★級
@@ -43,7 +43,7 @@
 	 * @param maxTime
 	 * @return
 	 */
-	public long countUserMoneyDetailForClient(Long uid, Long userMoneyDetailId, Date maxTime);
+	public long countUserMoneyDetailForClient(Long uid, Long userMoneyDetailId,Integer type, Date maxTime);
 
 	/**
 	 * 璧勯噾鏄庣粏璇︽儏鍒楄〃锛堣�佺増鏈級
@@ -77,6 +77,18 @@
 			Date maxDate);
 
 	/**
+	 * 鍒嗙被鍨嬩笌鏃堕棿缁熻鐢ㄦ埛鐨勮祫閲戞�诲拰
+	 * 
+	 * @param uid
+	 * @param typeList
+	 * @param minDate
+	 * @param maxDate
+	 * @return
+	 */
+	public BigDecimal statisticUserTypeMoneyWithDate(Long uid, List<UserMoneyDetailTypeEnum> typeList, Date minDate,
+			Date maxDate, Integer show);
+	
+	/**
 	 * 鏍规嵁绫诲瀷锛岀敤鎴稩D涓庡敮涓�鏍囪瘑绗︽煡璇�
 	 * 
 	 * @param type
@@ -87,4 +99,15 @@
 	public UserMoneyDetail selectByTypeAndUidAndIdentifyCode(UserMoneyDetailTypeEnum type, Long uid,
 			Long sourceIdentifyId);
 
+	/**
+	 * 鏌ヨ鏄庣粏缁熻
+	 * @param page
+	 * @param pageSize
+	 * @param key
+	 * @return
+	 */
+	public List<UserMoneyDetail> listQuery(int page, int pageSize, String key, Integer keyType);
+
+	public long countQuery(String key, Integer keyType);
+
 }

--
Gitblit v1.8.0