From 075f6eceec6908178ba53b40b7794e2f90f74c92 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 09 一月 2019 17:40:10 +0800
Subject: [PATCH] 冲突解决

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserActiveLogService.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 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 55c659d..688694a 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;
 
@@ -51,7 +52,11 @@
 	 * @return
 	 * @throws Exception
 	 */
-	public List<Object> getBuyProportion(String channel, Integer type, String years, String startTime, String endTime)
+	public List<Object> getBuyProportion(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