From 5797fc7e8267d634ee64fd27cdea2a834091681e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 15 一月 2019 11:10:24 +0800
Subject: [PATCH] Merge branch 'master' into dev-msg
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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 041a30e..d453571 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
@@ -182,7 +182,12 @@
String year, String startTime, String endTime) throws Exception {
return hongBaoV2CountMapper.countHongBaoNum(channel, dateType, state, year, startTime, endTime);
}
-
+
+ @Override
+ public List<Map<String, Object>> countHongBaoType(Integer dateType, Integer type, String year,
+ String startTime, String endTime) throws Exception {
+ return hongBaoV2CountMapper.countHongBaoType(dateType, type, year, startTime, endTime);
+ }
@Override
public List<Map<String, Object>> getProportionByType(Integer dateType, Integer type, String year,
@@ -277,4 +282,11 @@
public Date getLastHongBaoTime(Long uid) {
return hongBaoV2CountMapper.getLastHongBaoTime(uid);
}
+
+
+ @Override
+ public List<Map<String, Object>> count24HOderByChannel(String channel, Integer type, String years,
+ String startTime, String endTime) throws Exception{
+ return hongBaoV2CountMapper.count24HOderByChannel(channel, type, years, startTime, endTime);
+ }
}
--
Gitblit v1.8.0