From ee88b54979c633a4ade518d4c124a2d07d378562 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期五, 11 十月 2019 10:56:18 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java index f205e96..f8b7a66 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java @@ -4,6 +4,8 @@ import java.util.List; import java.util.Map; +import com.yeshi.fanli.dto.ChartTDO; + public interface CommonOrderCountService { @@ -19,7 +21,7 @@ * @param channel * @return */ - public List<Map<String, Object>> getTrackAccuracyRate(Integer dateType, String year, String startTime, + public List<ChartTDO> getTrackAccuracyRate(Integer dateType, String year, String startTime, String endTime,int sourceType) throws Exception; /** @@ -31,7 +33,7 @@ * @return * @throws Exception */ - public List<Map<String, Object>> countWeiQaunOrderMoney(Integer dateType, String year, String startTime, + public List<ChartTDO> countWeiQaunOrderMoney(Integer dateType, String year, String startTime, String endTime) throws Exception; /** @@ -43,7 +45,7 @@ * @return * @throws Exception */ - public List<Map<String, Object>> countWeiQaunOrderNumber(Integer dateType, String year, String startTime, String endTime) + public List<ChartTDO> countWeiQaunOrderNumber(Integer dateType, String year, String startTime, String endTime) throws Exception; /** -- Gitblit v1.8.0