From 48934b8c3da5a6791d0805ff0c1d327da834cc2d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 29 六月 2020 16:39:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserSystemCouponCountServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 75e4762..7e62a7f 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
@@ -268,13 +268,23 @@
@Override
public BigDecimal countFreeMoneyByTypeAndDay(CouponTypeEnum typeEnum, String preDay){
- return userSystemCouponCountMapper.countFreeMoneyByTypeAndDay(typeEnum.name(), preDay);
+ return userSystemCouponCountMapper.countFreeMoneyByTypeAndDay(typeEnum.name(), preDay, null);
+ }
+
+ @Override
+ public BigDecimal countFreeMoneyByTypeAndDay(CouponTypeEnum typeEnum, String preDay, String source){
+ return userSystemCouponCountMapper.countFreeMoneyByTypeAndDay(typeEnum.name(), preDay, source);
}
@Override
public BigDecimal countCouponNumByDay(CouponTypeEnum typeEnum, String preDay){
- return userSystemCouponCountMapper.countCouponNumByDay(typeEnum.name(), preDay);
+ return userSystemCouponCountMapper.countCouponNumByDay(typeEnum.name(), preDay, null);
+ }
+
+ @Override
+ public BigDecimal countCouponNumByDay(CouponTypeEnum typeEnum, String preDay, String source){
+ return userSystemCouponCountMapper.countCouponNumByDay(typeEnum.name(), preDay, source);
}
@Override
--
Gitblit v1.8.0