From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserSystemCouponCountServiceImpl.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserSystemCouponCountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserSystemCouponCountServiceImpl.java
index 7ec0391..323138f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserSystemCouponCountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserSystemCouponCountServiceImpl.java
@@ -3,7 +3,6 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
import javax.annotation.Resource;
@@ -11,6 +10,7 @@
import org.springframework.stereotype.Service;
import com.yeshi.fanli.dao.mybatis.user.UserSystemCouponCountMapper;
+import com.yeshi.fanli.dto.ChartTDO;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
import com.yeshi.fanli.entity.bus.user.UserSystemCouponRecord;
@@ -262,21 +262,39 @@
@Override
- public List<Map<String, Object>> getRebateCouponUsedNumToCharts(Integer dateType, String year,
+ public List<ChartTDO> getRebateCouponUsedNumToCharts(Integer dateType, String year,
String startTime, String endTime){
return userSystemCouponCountMapper.getRebateCouponUsedNumToCharts(dateType, year, startTime, endTime);
}
@Override
- public List<Map<String, Object>> getRebateCouponMoneyToCharts(Integer dateType, String year,
+ public List<ChartTDO> getRebateCouponMoneyToCharts(Integer dateType, String year,
String startTime, String endTime){
return userSystemCouponCountMapper.getRebateCouponMoneyToCharts(dateType, year, startTime, endTime);
}
@Override
- public List<Map<String, Object>> getFreeCouponMoneyToCharts(Integer dateType, String year, String startTime,
+ public List<ChartTDO> getFreeCouponMoneyToCharts(Integer dateType, String year, String startTime,
String endTime, String couponType){
return userSystemCouponCountMapper.getFreeCouponMoneyToCharts(dateType, year, startTime, endTime, couponType);
}
+
+ @Override
+ public BigDecimal countRebateMoneyByDay(String preDay){
+ return userSystemCouponCountMapper.countRebateMoneyByDay(preDay);
+ }
+
+
+ @Override
+ public BigDecimal countFreeMoneyByTypeAndDay(CouponTypeEnum typeEnum, String preDay){
+ return userSystemCouponCountMapper.countFreeMoneyByTypeAndDay(typeEnum.name(), preDay);
+ }
+
+
+ @Override
+ public BigDecimal countCouponNumByDay(CouponTypeEnum typeEnum, String preDay){
+ return userSystemCouponCountMapper.countCouponNumByDay(typeEnum.name(), preDay);
+ }
+
}
--
Gitblit v1.8.0