From 3f7c35dcb3bd703fcb952bb1a7d3ba5088d87b54 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 30 十月 2019 15:13:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/redpack/RedPackExchangeService.java |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/redpack/RedPackExchangeService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/redpack/RedPackExchangeService.java
index 98cd9ca..d83f84b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/redpack/RedPackExchangeService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/redpack/RedPackExchangeService.java
@@ -34,14 +34,8 @@
 	 * @param uid
 	 * @return
 	 */
-	public List<Long> countState(long uid);
+	public Long countByUidAndState(long uid,  Integer state);
 
-	/**
-	 * 缁熻鍚勪釜鐘舵�侀噾棰�
-	 * @param uid
-	 * @return
-	 */
-	public List<BigDecimal> countMoneyState(long uid);
 
 	/**
 	 * 鑾峰彇鐢宠
@@ -73,7 +67,7 @@
 	 * @param state
 	 * @return
 	 */
-	public BigDecimal countMoneyByState(Long uid, Integer state);
+	public BigDecimal countMoneyByUidAndState(Long uid, Integer state);
 
 
 }

--
Gitblit v1.8.0