From 02d8f36a2a51a2ffcacdb619bee34077da61b328 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 10 一月 2019 15:23:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 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 4195a23..a8abb3b 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
@@ -1,10 +1,28 @@
package com.yeshi.fanli.service.inter.count;
+import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
public interface HongBaoV2CountService {
+
+ /**
+ * 缁熻鍘嗗彶鎬诲埌璐﹂噾棰�
+ * @param uid
+ * @param state
+ * @return
+ */
+ public BigDecimal countMoneyByUidAndState(Long uid, Integer state);
+
+ /**
+ * 缁熻鍘嗗彶绾㈠寘鏁伴噺
+ * @param uid
+ * @param state
+ * @return
+ */
+ public Integer countNumberByUidAndState(Long uid, Integer state);
+
/**
* 缁熻鎬婚噾棰�
* @param channel 娓犻亾
@@ -15,7 +33,7 @@
* @param endTime 缁撴潫鏃堕棿
* @return
*/
- List<Map<String, Object>> countHongBaoMoney(String channel, Integer dateType, Integer state, String year,
+ public List<Map<String, Object>> countHongBaoMoney(String channel, Integer dateType, Integer state, String year,
String startTime, String endTime) throws Exception;
/**
@@ -28,7 +46,23 @@
* @param endTime 缁撴潫鏃堕棿
* @return
*/
- List<Map<String, Object>> countHongBaoNum(String channel, Integer dateType, Integer state, String year,
+ public List<Map<String, Object>> countHongBaoNum(String channel, Integer dateType, Integer state, String year,
String startTime, String endTime) throws Exception;
+
+ /**
+ * 鍒嗙被鍨嬭鍗曟暟涓庢瘮渚�
+ * @param dateType
+ * @param type
+ * @param year
+ * @param startTime
+ * @param endTime
+ * @return
+ * @throws Exception
+ */
+ public List<Map<String, Object>> getProportionByType(Integer dateType, Integer type, String year, String startTime,
+ String endTime) throws Exception;
+
+
+
}
--
Gitblit v1.8.0