From 51a4ff5d777028d52a19c314a99f796334cb7b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:30:01 +0800
Subject: [PATCH] 配置文件修改

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java |   30 ++++++++++++++++++++++++------
 1 files changed, 24 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..4d84adf 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,
@@ -169,5 +169,23 @@
 	 * @return
 	 */
 	long countShareOrInviteOrder(@Param("uid") Long uid);
+	
+	/**
+	 * 缁熻涓嬬骇浜х敓鏈夋晥鍒嗕韩濂栭噾
+	 * @param uid
+	 * @param teamUid 涓嬬骇id
+	 * @param endTime 缁撴潫鏃堕棿
+	 * @return
+	 */
+	BigDecimal getShareRewardByTeamUid(@Param("uid") Long uid, @Param("teamUid") Long teamUid, @Param("endTime") Date endTime);
+
+	/**
+	 * 缁熻涓嬬骇涓婁釜鏈夋晥璁㈠崟
+	 * @param uid
+	 * @param teamUid 涓嬬骇id
+	 * @param endTime 缁撴潫鏃堕棿
+	 * @return
+	 */
+	BigDecimal getShareRewardByTeamUidLastMonth(@Param("uid") Long uid, @Param("teamUid") Long teamUid);
 
 }
\ No newline at end of file

--
Gitblit v1.8.0