From c53f14a5c5d0bb6623987de84ef1bb8f8a8dbb3f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 14 一月 2019 18:13:24 +0800
Subject: [PATCH] Merge branch 'div1'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java
index 4b646d4..4c48552 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java
@@ -94,5 +94,21 @@
 	 * @return
 	 */
 	public Date getLastHongBaoTime(Long uid);
+
+	public List<Map<String, Object>> count24HOderByChannel(String channel, Integer type, String years, String startTime,
+			String endTime) throws Exception;
+
+	/**
+	 * 缁熻鎵�鏈夌被鍨嬭鍗曟暟閲�
+	 * @param dateType
+	 * @param type
+	 * @param year
+	 * @param startTime
+	 * @param endTime
+	 * @return
+	 * @throws Exception
+	 */
+	public List<Map<String, Object>> countHongBaoType(Integer dateType, Integer type, String year, String startTime,
+			String endTime) throws Exception;
 	
 }

--
Gitblit v1.8.0