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/count/HongBaoV2CountService.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java
index 49aaf9a..b32849b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java
@@ -3,8 +3,8 @@
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
-import java.util.Map;
+import com.yeshi.fanli.dto.ChartTDO;
import com.yeshi.fanli.vo.order.HongBaoV2VO;
public interface HongBaoV2CountService {
@@ -52,7 +52,7 @@
* 缁撴潫鏃堕棿
* @return
*/
- public List<Map<String, Object>> countHongBaoMoney(String channel, Integer dateType, Integer state, String year,
+ public List<ChartTDO> countHongBaoMoney(String channel, Integer dateType, Integer state, String year,
String startTime, String endTime) throws Exception;
/**
@@ -72,7 +72,7 @@
* 缁撴潫鏃堕棿
* @return
*/
- public List<Map<String, Object>> countHongBaoNum(String channel, Integer dateType, Integer state, String year,
+ public List<ChartTDO> countHongBaoNum(String channel, Integer dateType, Integer state, String year,
String startTime, String endTime) throws Exception;
/**
@@ -86,7 +86,7 @@
* @return
* @throws Exception
*/
- public List<Map<String, Object>> getProportionByType(Integer dateType, Integer type, String year, String startTime,
+ public List<ChartTDO> getProportionByType(Integer dateType, Integer type, String year, String startTime,
String endTime) throws Exception;
/**
@@ -123,7 +123,7 @@
*/
public Date getLastHongBaoTime(Long uid);
- public List<Map<String, Object>> count24HOderByChannel(String channel, Integer type, String years, String startTime,
+ public List<ChartTDO> count24HOderByChannel(String channel, Integer type, String years, String startTime,
String endTime) throws Exception;
/**
@@ -137,7 +137,7 @@
* @return
* @throws Exception
*/
- public List<Map<String, Object>> countHongBaoType(Integer dateType, Integer type, String year, String startTime,
+ public List<ChartTDO> countHongBaoType(Integer dateType, Integer type, String year, String startTime,
String endTime) throws Exception;
/**
--
Gitblit v1.8.0