From 148af6b2f57be264c84d0991237fbd7ddea491a4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 04 十一月 2019 09:55:55 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/redpack/RedPackExchangeMapper.java |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/redpack/RedPackExchangeMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/redpack/RedPackExchangeMapper.java
index dd0dcdc..4bcb61f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/redpack/RedPackExchangeMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/redpack/RedPackExchangeMapper.java
@@ -29,21 +29,14 @@
 	 * @param uid
 	 * @return
 	 */
-	List<Long> countState(@Param("uid") long uid);
+	Long countByUidAndState(@Param("uid") long uid, @Param("state") Integer state);
 	
-	
-	/**
-	 * 缁熻鍚勪釜鐘舵�侀噾棰�
-	 * @param uid
-	 * @return
-	 */
-	List<BigDecimal> countMoneyState(@Param("uid") long uid);
 	
 	/**
 	 * 缁熻鐘舵�侀噾棰�
 	 * @param uid
 	 * @return
 	 */
-	BigDecimal countMoneyByState(@Param("uid") Long uid, @Param("state") Integer state);
+	BigDecimal countMoneyByUidAndState(@Param("uid") Long uid, @Param("state") Integer state);
 		
 }
\ No newline at end of file

--
Gitblit v1.8.0