From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/money/UserMoneyDetailService.java |   15 +++++++++++++--
 1 files changed, 13 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..48f5f18 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);
 
 	/**
 	 * 璧勯噾鏄庣粏璇︽儏鍒楄〃锛堣�佺増鏈級
@@ -87,4 +87,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