From 0e5e21d2f3693dc993b3f49d88a275f7b226eba5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 19 一月 2019 17:38:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoService.java |   17 +++++++++++++++++
 1 files changed, 17 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..0d348f2 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
@@ -2,6 +2,7 @@
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 import com.yeshi.fanli.entity.admin.OrderAdmin;
 import com.yeshi.fanli.entity.bus.user.HongBao;
@@ -321,4 +322,20 @@
 	 */
 	public List<HongBao> listShareAndInviteMoney(long start, int count, String date);
 
+	/**
+	 * 鏍规嵁娓犻亾   缁熻鍘嗗彶浜х敓鐨勮鍗曟暟閲�
+	 * @param channel
+	 * @return
+	 */
+	public List<Map<String, Object>> countHistoryOderByChannel(String channelArray, Integer type, String year,
+			String startTime, String endTime) throws Exception;
+
+	/**
+	 * 鏍规嵁娓犻亾   缁熻鏂板鐢ㄦ埛24灏忔椂鍐呬骇鐢熺殑璁㈠崟鏁伴噺
+	 * @param channel
+	 * @return
+	 */
+	public List<Map<String, Object>> count24HOderByChannel(String channel, Integer type, String years,
+			String startTime, String endTime) throws Exception;
+
 }

--
Gitblit v1.8.0