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/dao/mybatis/HongBaoV2CountMapper.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java
index 045892c..77670d5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java
@@ -3,10 +3,10 @@
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
-import java.util.Map;
import org.apache.ibatis.annotations.Param;
+import com.yeshi.fanli.dto.ChartTDO;
import com.yeshi.fanli.vo.order.HongBaoV2VO;
public interface HongBaoV2CountMapper {
@@ -49,7 +49,7 @@
* @param endTime
* @return
*/
- List<Map<String, Object>> countHongBaoMoney(@Param("channel") String channel, @Param("dateType") Integer dateType,
+ List<ChartTDO> countHongBaoMoney(@Param("channel") String channel, @Param("dateType") Integer dateType,
@Param("state") Integer state, @Param("year") String year, @Param("startTime") String startTime,
@Param("endTime") String endTime);
@@ -65,7 +65,7 @@
* @param endTime
* @return
*/
- List<Map<String, Object>> countHongBaoNum(@Param("channel") String channel, @Param("dateType") Integer dateType,
+ List<ChartTDO> countHongBaoNum(@Param("channel") String channel, @Param("dateType") Integer dateType,
@Param("state") Integer state, @Param("year") String year, @Param("startTime") String startTime,
@Param("endTime") String endTime);
@@ -81,7 +81,7 @@
* @param endTime
* @return
*/
- List<Map<String, Object>> countHongBaoType(@Param("dateType") Integer dateType, @Param("type") Integer type,
+ List<ChartTDO> countHongBaoType(@Param("dateType") Integer dateType, @Param("type") Integer type,
@Param("year") String year, @Param("startTime") String startTime, @Param("endTime") String endTime);
/**
@@ -96,7 +96,7 @@
* @param endTime
* @return
*/
- List<Map<String, Object>> countHongBaoTotalNum(@Param("dateType") Integer dateType, @Param("year") String year,
+ List<ChartTDO> countHongBaoTotalNum(@Param("dateType") Integer dateType, @Param("year") String year,
@Param("startTime") String startTime, @Param("endTime") String endTime);
// 绱鎻愭垚璁㈠崟鏁伴噺锛堝寘鍚棤鏁堣鍗曪級
@@ -127,7 +127,7 @@
* @param channel
* @return
*/
- List<Map<String, Object>> count24HOderByChannel(@Param("channel") String channel, @Param("type") Integer type,
+ List<ChartTDO> count24HOderByChannel(@Param("channel") String channel, @Param("type") Integer type,
@Param("years") String years, @Param("startTime") String startTime, @Param("endTime") String endTime);
List<HongBaoV2VO> listShareAndInviteMoney(@Param("start") long start, @Param("count") int count,
--
Gitblit v1.8.0