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/dao/mybatis/HongBaoV2CountMapper.java |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 47 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java
index 098300b..69f3991 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java
@@ -1,5 +1,6 @@
 package com.yeshi.fanli.dao.mybatis;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -7,6 +8,24 @@
 
 public interface HongBaoV2CountMapper {
 
+	
+	/**
+	 * 缁熻鍘嗗彶鎬诲埌璐﹂噾棰�
+	 * @param uid 
+	 * @param state 
+	 * @return
+	 */
+	BigDecimal countMoneyByUidAndState(@Param("uid")Long uid, @Param("state") Integer state);
+	
+	
+	/**
+	 * 缁熻鍘嗗彶绾㈠寘鏁伴噺
+	 * @param uid 
+	 * @param state 
+	 * @return
+	 */
+	Integer countNumberByUidAndState(@Param("uid")Long uid, @Param("state") Integer state);
+	
 	/**
 	 * 缁熻鎬婚噾棰�
 	 * @param channel 娓犻亾
@@ -35,5 +54,33 @@
 			@Param("state") Integer state, @Param("year") String year, 
 			@Param("startTime")String startTime, @Param("endTime")String endTime);
 	
+	
+	/**
+	 * 缁熻鎬讳釜鏁�
+	 * @param channel 娓犻亾
+	 * @param type 
+	 * @param state
+	 * @param years
+	 * @param startTime
+	 * @param endTime
+	 * @return
+	 */
+	List<Map<String, Object>> countHongBaoType(@Param("dateType")Integer dateType, 
+			@Param("type") Integer type, @Param("year") String year, 
+			@Param("startTime")String startTime, @Param("endTime")String endTime);
+	
+	/**
+	 * 缁熻鎬讳釜鏁�
+	 * @param channel 娓犻亾
+	 * @param type 
+	 * @param state
+	 * @param years
+	 * @param startTime
+	 * @param endTime
+	 * @return
+	 */
+	List<Map<String, Object>> countHongBaoTotalNum(@Param("dateType")Integer dateType, @Param("year") String year,
+			@Param("startTime")String startTime, @Param("endTime")String endTime);
+	
 
 }
\ No newline at end of file

--
Gitblit v1.8.0