From 65460a2dc7c69d8c0e031ec4c89e25d47e5173f2 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期二, 10 九月 2019 16:54:11 +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 | 25 ++++++++++++++++++++++++- 1 files changed, 24 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..f1b5db2 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,9 @@ import java.math.BigDecimal; import java.util.List; +import java.util.Map; + +import com.yeshi.fanli.vo.user.UserGoldCoinVO; @@ -48,5 +51,25 @@ * 缁熻鏂板鐢ㄦ埛 * @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; + + + /** + * 缁熻鐢ㄦ埛閲戝竵鎯呭喌 + * @param start + * @param count + * @return + */ + public List<UserGoldCoinVO> listByUserGoldCoin(long start, int count, int type); + + } -- Gitblit v1.8.0