From e40d1c22c7202aac843c66f9ee9cc000744f9e10 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 六月 2020 15:52:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserSystemCouponCountService.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserSystemCouponCountService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserSystemCouponCountService.java
index 633315d..894c354 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserSystemCouponCountService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserSystemCouponCountService.java
@@ -98,5 +98,19 @@
 	 * @return
 	 */
 	public BigDecimal countCouponNumByDay(CouponTypeEnum typeEnum, String preDay);
+
+	/**
+	 * 缁熻鍒告暟閲�
+	 * @param state
+	 * @param activated
+	 * @param list
+	 * @param listSource
+	 * @return
+	 */
+	public long countCouponNum(Long uid, Integer state, Integer activated, List<String> list, List<String> listSource);
+
+	public BigDecimal countCouponNumByDay(CouponTypeEnum typeEnum, String preDay, String source);
+
+	public BigDecimal countFreeMoneyByTypeAndDay(CouponTypeEnum typeEnum, String preDay, String source);
 	
 }

--
Gitblit v1.8.0