From 148af6b2f57be264c84d0991237fbd7ddea491a4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 04 十一月 2019 09:55:55 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 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 4ac73ea..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 {
@@ -29,6 +29,7 @@
/**
* 缁熻鐢ㄦ埛绾㈠寘鏁伴噺
+ *
* @param uid
* @return
*/
@@ -51,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;
/**
@@ -71,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;
/**
@@ -85,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;
/**
@@ -122,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;
/**
@@ -136,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;
/**
@@ -149,4 +150,38 @@
*/
public List<HongBaoV2VO> listShareAndInviteMoney(long start, int count, String date);
+ /**
+ * 濂栧姳鍒搁噾棰�
+ *
+ * @return
+ */
+ public BigDecimal countRebateCouponMoney();
+
+ /**
+ * 缁熻杩斿埄璁㈠崟
+ * @param uid
+ * @return
+ */
+ public long countRebateOrder(Long uid);
+
+ /**
+ * 缁熻鍒嗕韩+ 閭�璇疯鍗�
+ * @param uid
+ * @return
+ */
+ public long countShareOrInviteOrder(Long uid);
+
+ /**
+ * 缁熻宸插埌璐�
+ *
+ * @param uid
+ * @param typeList
+ * @param minGetTime
+ * @param maxGetTime
+ * @return
+ */
+ public BigDecimal sumAlreadyGetMoneyByUid(Long uid, List<Integer> typeList, Date minGetTime, Date maxGetTime);
+
+ public long countAlreadyGetMoneyByUid(Long uid, List<Integer> typeList, Date minGetTime, Date maxGetTime);
+
}
--
Gitblit v1.8.0