From 3ac30b4c17cf071ce9c66a59c069ab83efae6d2d Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期一, 14 十月 2019 17:44:13 +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 | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 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 f1b5db2..ff2dd95 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,8 +2,8 @@ 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; @@ -51,11 +51,11 @@ * 缁熻鏂板鐢ㄦ埛 * @return */ - public List<Map<String, Object>> countNewUserByDate(String channel,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<Map<String, Object>> getTodayBuyRate(String channel, Integer type, String years, String startTime, + public List<ChartTDO> getTodayBuyRate(String channel, Integer type, String years, String startTime, String endTime) throws Exception; @@ -70,6 +70,17 @@ * @return */ public List<UserGoldCoinVO> listByUserGoldCoin(long start, int count, int type); - + + public long countByUserGoldCoin(int type); + + /** + * 缁熻鍓╀綑閲戝竵 + * @param start + * @param count + * @return + */ + public List<UserGoldCoinVO> listByHasGoldCoin(long start, int count); + + public long countByHasGoldCoin(); } -- Gitblit v1.8.0