From df03194e4b0c0737cf84127c4dd69d456e30ed24 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 三月 2019 12:24:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java | 83 +++++++++++++++++++++++++++--------------
1 files changed, 55 insertions(+), 28 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 3254232..4ac73ea 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
@@ -7,53 +7,76 @@
import com.yeshi.fanli.vo.order.HongBaoV2VO;
-
public interface HongBaoV2CountService {
-
+
/**
* 缁熻鍘嗗彶鎬诲埌璐﹂噾棰�
- * @param uid
- * @param state
+ *
+ * @param uid
+ * @param state
* @return
*/
public BigDecimal countMoneyByUidAndState(Long uid, Integer state);
-
+
/**
* 缁熻鍘嗗彶绾㈠寘鏁伴噺
- * @param uid
- * @param state
+ *
+ * @param uid
+ * @param state
* @return
*/
public Integer countNumberByUidAndState(Long uid, Integer state);
-
+
/**
- * 缁熻鎬婚噾棰�
- * @param channel 娓犻亾
- * @param dateType 鏃ユ湡鏍煎紡 鏃�-1 鏈�-2 骞�-3
- * @param state 鐘舵��
- * @param years 骞翠唤
- * @param startTime 寮�濮嬫椂闂�
- * @param endTime 缁撴潫鏃堕棿
+ * 缁熻鐢ㄦ埛绾㈠寘鏁伴噺
+ * @param uid
* @return
*/
- public List<Map<String, Object>> countHongBaoMoney(String channel, Integer dateType, Integer state, String year,
+ public Integer countNumberByUid(Long uid);
+
+ /**
+ * 缁熻鎬婚噾棰�
+ *
+ * @param channel
+ * 娓犻亾
+ * @param dateType
+ * 鏃ユ湡鏍煎紡 鏃�-1 鏈�-2 骞�-3
+ * @param state
+ * 鐘舵��
+ * @param years
+ * 骞翠唤
+ * @param startTime
+ * 寮�濮嬫椂闂�
+ * @param endTime
+ * 缁撴潫鏃堕棿
+ * @return
+ */
+ public List<Map<String, Object>> countHongBaoMoney(String channel, Integer dateType, Integer state, String year,
String startTime, String endTime) throws Exception;
-
+
/**
* 缁熻鎬婚噾棰�
- * @param channel 娓犻亾
- * @param dateType 鏃ユ湡鏍煎紡 鏃�-1 鏈�-2 骞�-3
- * @param state 鐘舵��
- * @param years 骞翠唤
- * @param startTime 寮�濮嬫椂闂�
- * @param endTime 缁撴潫鏃堕棿
+ *
+ * @param channel
+ * 娓犻亾
+ * @param dateType
+ * 鏃ユ湡鏍煎紡 鏃�-1 鏈�-2 骞�-3
+ * @param state
+ * 鐘舵��
+ * @param years
+ * 骞翠唤
+ * @param startTime
+ * 寮�濮嬫椂闂�
+ * @param endTime
+ * 缁撴潫鏃堕棿
* @return
*/
- public 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
@@ -67,23 +90,24 @@
/**
* 缁熻鎻愭垚璁㈠崟鏁伴噺
+ *
* @param uid
* @return
*/
public int getTotalTiChengCount(Long uid);
-
/**
* 缁熻鏈け鏁堣鍗曟暟閲�
+ *
* @param uid
* @param dateType
* @return
*/
public long countValidNumberByUid(Long uid, Integer dateType);
-
-
+
/**
* 缁熻鏈埌璐﹂噾棰�
+ *
* @param uid
* @param dateType
* @return
@@ -92,6 +116,7 @@
/**
* 鏈�鍚庝竴娆′笅鍗曟椂闂�
+ *
* @param uid
* @return
*/
@@ -102,6 +127,7 @@
/**
* 缁熻鎵�鏈夌被鍨嬭鍗曟暟閲�
+ *
* @param dateType
* @param type
* @param year
@@ -115,11 +141,12 @@
/**
* 鏌ヨ閭�璇�=鍒嗕韩濂栭噾
+ *
* @param start
* @param count
* @param date
* @return
*/
public List<HongBaoV2VO> listShareAndInviteMoney(long start, int count, String date);
-
+
}
--
Gitblit v1.8.0