From baacd1378b33c4a84ee7a4998fb08fd9979ee4e1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 09 一月 2019 11:02:52 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoService.java
index eae0286..b5ec7dd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoService.java
@@ -321,4 +321,20 @@
 	 */
 	public List<HongBao> listShareAndInviteMoney(long start, int count, String date);
 
+	/**
+	 * 鏍规嵁娓犻亾   缁熻鍘嗗彶浜х敓鐨勮鍗曟暟閲�
+	 * @param channel
+	 * @return
+	 */
+	public List<Object> countHistoryOderByChannel(String channelArray, Integer type, String year,
+			String startTime, String endTime) throws Exception;
+
+	/**
+	 * 鏍规嵁娓犻亾   缁熻鏂板鐢ㄦ埛24灏忔椂鍐呬骇鐢熺殑璁㈠崟鏁伴噺
+	 * @param channel
+	 * @return
+	 */
+	public List<Object> count24HOderByChannel(String channel, Integer type, String years,
+			String startTime, String endTime) throws Exception;
+
 }

--
Gitblit v1.8.0