From 1e1e0de2e21acc0de4c0c2bcd0908c1c7ef7b5ec Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期五, 11 十月 2019 17:18:53 +0800 Subject: [PATCH] 天猫非推广商品 信息兼容没有Detail情况 --- fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java index ff39df7..8cd39b1 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java @@ -19,6 +19,7 @@ import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; import com.yeshi.fanli.controller.admin.utils.AdminUtils; +import com.yeshi.fanli.dto.ChartTDO; import com.yeshi.fanli.entity.bus.user.BindingAccount; import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode; import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum; @@ -857,7 +858,7 @@ JSONArray line_list = new JSONArray(); for (String channel : channelList) { - List<Map<String, Object>> list = userInfoCountService.countNewUserByDate(channel, dateType, year, + List<ChartTDO> list = userInfoCountService.countNewUserByDate(channel, dateType, year, startTime, endTime); if ("all".equalsIgnoreCase(channel)) { @@ -975,7 +976,7 @@ JSONArray line_list = new JSONArray(); for (String channel : channelList) { - List<Map<String, Object>> list = userInfoCountService.getTodayBuyRate(channel, dateType, year, + List<ChartTDO> list = userInfoCountService.getTodayBuyRate(channel, dateType, year, startTime, endTime); if ("all".equalsIgnoreCase(channel)) { -- Gitblit v1.8.0