From 148af6b2f57be264c84d0991237fbd7ddea491a4 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期一, 04 十一月 2019 09:55:55 +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 | 37 +++++++++++++++++++++++++++++++++++-- 1 files changed, 35 insertions(+), 2 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 8b3d681..6ca35f1 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,7 +2,9 @@ import java.math.BigDecimal; import java.util.List; -import java.util.Map; + +import com.yeshi.fanli.dto.ChartTDO; +import com.yeshi.fanli.vo.user.UserGoldCoinVO; @@ -49,5 +51,36 @@ * 缁熻鏂板鐢ㄦ埛 * @return */ - public List<Map<String, Object>> countNewUserByDate(Integer type,String years, String startTime, String endTime) throws Exception; + public List<ChartTDO> countNewUserByDate(String channel,Integer type,String years, String startTime, String endTime) throws Exception; + + + + public List<ChartTDO> 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, String key); + + public long countByUserGoldCoin(int type, String key); + + /** + * 缁熻鍓╀綑閲戝竵 + * @param start + * @param count + * @return + */ + public List<UserGoldCoinVO> listByHasGoldCoin(long start, int count, String key); + + public long countByHasGoldCoin(String key); + } -- Gitblit v1.8.0