From ea022e84777312b730257dfcf2a33e865c8e07b7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 26 十一月 2019 14:23:46 +0800
Subject: [PATCH] 资金明细接口增加筛选

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java
index 2541940..356958f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java
@@ -82,11 +82,14 @@
 	 *            骞翠唤
 	 * @param month
 	 *            鏈堜唤
+	 * @param type
+	 *            1-鏀跺叆 2-鏀嚭 0-鍏ㄩ儴
+	 * 
 	 * @param out
 	 */
 	@RequestMapping(value = "getUserMoneyDetailList")
 	public void getUserMoneyDetailList(AcceptData acceptData, Long uid, Long index, Integer year, Integer month,
-			PrintWriter out) {
+			Integer type, PrintWriter out) {
 		if (uid == null || uid == 0) {
 			out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
 			return;
@@ -107,8 +110,8 @@
 			date = new Date(ca.getTimeInMillis() - 1);
 		}
 
-		List<UserMoneyDetailHistoryVO> list = userMoneyDetailService.listUserMoneyDetailForClient(uid, index, date);
-		long count = userMoneyDetailService.countUserMoneyDetailForClient(uid, index, date);
+		List<UserMoneyDetailHistoryVO> list = userMoneyDetailService.listUserMoneyDetailForClient(uid, index, 0, date);
+		long count = userMoneyDetailService.countUserMoneyDetailForClient(uid, index, 0, date);
 		GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
 		gsonBuilder.registerTypeAdapter(UserMoneyDetailTypeEnum.class, new TypeAdapter<UserMoneyDetailTypeEnum>() {
 			@Override

--
Gitblit v1.8.0