From 02d8f36a2a51a2ffcacdb619bee34077da61b328 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 10 一月 2019 15:23:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserMoneyDetailService.java |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserMoneyDetailService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserMoneyDetailService.java
index c7d7035..655ae46 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserMoneyDetailService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserMoneyDetailService.java
@@ -1,8 +1,11 @@
 package com.yeshi.fanli.service.inter.user;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
+import com.yeshi.fanli.entity.money.UserMoneyDetail;
+import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;
 import com.yeshi.fanli.vo.money.UserMoneyDetailHistoryVO;
 
 /**
@@ -33,4 +36,35 @@
 	 */
 	public long countUserMoneyDetailForClient(Long uid, Long userMoneyDetailId, Date maxTime);
 
+	/**
+	 * 璧勯噾鏄庣粏璇︽儏鍒楄〃锛堣�佺増鏈級
+	 * 
+	 * @param uid
+	 * @param page
+	 * @param pageSize
+	 * @return
+	 */
+
+	public List<UserMoneyDetail> listByUidWithState(Long uid, int page, int pageSize);
+
+	/**
+	 * 璧勯噾鏄庣粏璇︽儏鎬绘暟锛堣�佺増鏈級
+	 * 
+	 * @param uid
+	 * @return
+	 */
+	public long countByUidWithState(Long uid);
+
+	/**
+	 * 鍒嗙被鍨嬩笌鏃堕棿缁熻鐢ㄦ埛鐨勮祫閲戞�诲拰
+	 * 
+	 * @param uid
+	 * @param typeList
+	 * @param minDate
+	 * @param maxDate
+	 * @return
+	 */
+	public BigDecimal statisticUserTypeMoneyWithDate(Long uid, List<UserMoneyDetailTypeEnum> typeList, Date minDate,
+			Date maxDate);
+
 }

--
Gitblit v1.8.0