From 88b54772dbcf5ecab1e2316e4e4626ac901b8908 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 22 一月 2019 15:58:24 +0800
Subject: [PATCH] 邀请码添加返回状态

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoService.java |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 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..17ca6d1 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;
@@ -165,10 +166,6 @@
 	 */
 	public void connectHongBaoAndOrderItem();
 
-	public void addHongBao(Order order, TaoBaoOrder taoBaoOrder, Long orderItemId);
-
-	public void updateHongBao(HongBao hongBao, TaoBaoOrder taoBaoOrder);
-
 	/**
 	 * 绱鎻愭垚璁㈠崟鏁伴噺锛堝寘鍚棤鏁堢殑璁㈠崟锛�
 	 * 
@@ -321,4 +318,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