From 92c681fabac989d1a9f16fa13202d7f5ccac52d9 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 14 一月 2019 10:22:22 +0800
Subject: [PATCH] 订单优化 + 后台提现曲线图

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserActiveLogService.java |   21 ++++++---------------
 1 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserActiveLogService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserActiveLogService.java
index 9fc07b7..ca3fc33 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserActiveLogService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserActiveLogService.java
@@ -1,6 +1,7 @@
 package com.yeshi.fanli.service.inter.user;
 
 import java.util.List;
+import java.util.Map;
 
 import com.yeshi.fanli.entity.bus.user.UserActiveLog;
 
@@ -31,8 +32,8 @@
 	 * @param channel
 	 * @return
 	 */
-	public List<Object> countSameDayByChannel(String channel, Integer type, String years, String startTime, String endTime)
-			throws Exception;
+	public List<Map<String, Object>> countSameDayByChannel(String channel, Integer type, String years, 
+			String startTime, String endTime) throws Exception;
 	/**
 	 * 鏍规嵁娓犻亾   缁熻褰撴棩鏂板鐢ㄦ埛鏈夎喘涔拌涓虹殑鏁伴噺
 	 * @param channel
@@ -54,18 +55,8 @@
 	public List<Object> getBuyProportion(String channel, Integer type, String years, String startTime, String endTime,Integer orderNum)
 			throws Exception;
 
-	/**
-	 * 鏍规嵁娓犻亾   缁熻褰撴棩鏂板鐢ㄦ埛鏈夎喘涔拌涓虹殑璁㈠崟鏁伴噺澶т簬3
-	 * @param channel
-	 * @param type
-	 * @param years
-	 * @param startTime
-	 * @param endTime
-	 * @param orderNum
-	 * @return
-	 * @throws Exception
-	 */
-	public List<Object> countSameDayAndBuyGoodsByChannelAndBuyNum(String channel, Integer type, String years,
-			String startTime, String endTime, Integer orderNum) throws Exception;
+
+	public List<Map<String, Object>> countOneWeekUserInfo(String channel, String startTime, String endTime, Integer orderNumber)
+			throws Exception;
 
 }

--
Gitblit v1.8.0