From 9aa335f99a99c7e4b0e01b329bbd5d2c929fb3b8 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 27 二月 2019 18:24:25 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserInfoCountService.java | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserInfoCountService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserInfoCountService.java index 9cf2e97..1440722 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserInfoCountService.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserInfoCountService.java @@ -2,6 +2,7 @@ import java.math.BigDecimal; import java.util.List; +import java.util.Map; @@ -48,5 +49,14 @@ * 缁熻鏂板鐢ㄦ埛 * @return */ - public List<Object> countNewUserByDate(Integer type,String years, String startTime, String endTime) throws Exception; + public List<Map<String, Object>> countNewUserByDate(String channel,Integer type,String years, String startTime, String endTime) throws Exception; + + + + public List<Map<String, Object>> getTodayBuyRate(String channel, Integer type, String years, String startTime, + String endTime) throws Exception; + + + public List<Object> getWeekBuyRate(String channel, String startTime, String endTime, + Integer orderNum, List<String> dateList) throws Exception; } -- Gitblit v1.8.0