From ba94d20eea2cc91a57f4ffed9f09ee0eb6352bfc Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期四, 01 八月 2019 17:55:53 +0800 Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div --- 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