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/service/inter/count/HongBaoV2CountService.java |   43 +++++++++++++++++++++++++++++++++++++------
 1 files changed, 37 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 83c115b..4ea0395 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;
 
 	/**
@@ -158,6 +158,20 @@
 	public BigDecimal countRebateCouponMoney();
 
 	/**
+	 * 缁熻杩斿埄璁㈠崟
+	 * @param uid
+	 * @return
+	 */
+	public long countRebateOrder(Long uid);
+
+	/**
+	 * 缁熻鍒嗕韩+ 閭�璇疯鍗�
+	 * @param uid
+	 * @return
+	 */
+	public long countShareOrInviteOrder(Long uid);
+	
+	/**
 	 * 缁熻宸插埌璐�
 	 * 
 	 * @param uid
@@ -170,4 +184,21 @@
 
 	public long countAlreadyGetMoneyByUid(Long uid, List<Integer> typeList, Date minGetTime, Date maxGetTime);
 
+	/**
+	 * 鏌ヨ鏉ユ簮璇ヤ笅绾ф垚鍔熷垎浜閲戞椿鍔�
+	 * @param uid
+	 * @param teamUid
+	 * @param endTime
+	 * @return
+	 */
+	public BigDecimal getShareRewardByTeamUid(Long uid, Long teamUid, Date endTime);
+
+	/**
+	 * 缁熻涓嬬骇涓婁釜鏈夋晥璁㈠崟
+	 * @param uid
+	 * @param teamUid 涓嬬骇id
+	 * @return
+	 */
+	public BigDecimal getShareRewardByTeamUidLastMonth(Long uid, Long teamUid);
+
 }

--
Gitblit v1.8.0