From 17b490541bd688abcbc489937e6b3b800103cb9a Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 10 一月 2019 15:11:20 +0800
Subject: [PATCH] 后台统计 + 提现历史到账

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java |   47 +++++++++++++----------------------------------
 1 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java
index 7191a35..b66cb90 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java
@@ -1,5 +1,6 @@
 package com.yeshi.fanli.service.impl.count;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -173,45 +174,13 @@
 	@Override
 	public List<Map<String, Object>> countHongBaoMoney(String channel, Integer dateType, Integer state, 
 			String year, String startTime, String endTime) throws Exception {
-		
-		List<Map<String, Object>> list = hongBaoV2CountMapper.countHongBaoMoney(channel, dateType, state, year, startTime, endTime);
-		
-		if (list == null || list.size() == 0) {
-			return null;
-		} 
-		
-		switch (dateType){
-			case 1: // 鎸夊ぉ澶勭悊
-				return dayFactory(startTime, endTime, list);
-			case 2: // 鎸夋湀澶勭悊
-				return monthFactory(list);
-			case 3: 
-				return yearFactory(list);
-			default: 
-				return null;
-		}
+		return hongBaoV2CountMapper.countHongBaoMoney(channel, dateType, state, year, startTime, endTime);
 	}
 	
 	@Override
 	public List<Map<String, Object>> countHongBaoNum(String channel, Integer dateType, Integer state, 
 			String year, String startTime, String endTime) throws Exception {
-		
-		List<Map<String, Object>> list = hongBaoV2CountMapper.countHongBaoNum(channel, dateType, state, year, startTime, endTime);
-		
-		if (list == null || list.size() == 0) {
-			return null;
-		} 
-		
-		switch (dateType){
-			case 1: // 鎸夊ぉ澶勭悊
-				return dayFactory(startTime, endTime, list);
-			case 2: // 鎸夋湀澶勭悊
-				return monthFactory(list);
-			case 3: 
-				return yearFactory(list);
-			default: 
-				return null;
-		}
+		return hongBaoV2CountMapper.countHongBaoNum(channel, dateType, state, year, startTime, endTime);
 	}
 
 	
@@ -279,5 +248,15 @@
 		return result_list;
 	}
 
+	@Override
+	public BigDecimal countMoneyByUidAndState(Long uid, Integer state) {
+		return hongBaoV2CountMapper.countMoneyByUidAndState(uid, state);
+	}
+	
+	@Override
+	public Integer countNumberByUidAndState(Long uid, Integer state) {
+		return hongBaoV2CountMapper.countNumberByUidAndState(uid, state);
+	}
+
 	
 }

--
Gitblit v1.8.0