From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 20 五月 2020 17:25:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2 --- fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserSystemCouponCountService.java | 39 +++++++++++++++------------------------ 1 files changed, 15 insertions(+), 24 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 11c4dab..633315d 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 @@ -1,8 +1,9 @@ package com.yeshi.fanli.service.inter.count; +import java.math.BigDecimal; import java.util.List; -import java.util.Map; +import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum; import com.yeshi.fanli.vo.user.SystemCouponVO; import com.yeshi.fanli.vo.user.UserSystemCouponCountVO; @@ -73,39 +74,29 @@ public List<SystemCouponVO> listSystemCouponByFree(long start, int count, String key, Integer sort); public long countSystemCouponFree(String key); - + + /** - * 鏇茬嚎鍥�-濂栧姳鍒镐娇鐢ㄦ暟閲� - * @param dateType - * @param year - * @param startTime - * @param endTime + * 鏍规嵁鍒哥被鍨� 缁熻鍏嶅崟閲戦 + * @param typeEnum + * @param preDay * @return */ - public List<Map<String, Object>> getRebateCouponUsedNumToCharts(Integer dateType, String year, String startTime, - String endTime); + public BigDecimal countFreeMoneyByTypeAndDay(CouponTypeEnum typeEnum, String preDay); /** - * 濂栧姳鍒镐娇鐢ㄦ垚鍔熼噾棰濇洸绾垮浘 - * @param dateType - * @param year - * @param startTime - * @param endTime + * 缁熻濂栧姳鍒告垚鍔熼噾棰� + * @param preDay * @return */ - public List<Map<String, Object>> getRebateCouponMoneyToCharts(Integer dateType, String year, String startTime, - String endTime); + public BigDecimal countRebateMoneyByDay(String preDay); /** - * 缁熻鍏嶅崟鍒搁噾棰� - * @param dateType - * @param year - * @param startTime - * @param endTime - * @param couponType + * 姣忔棩鏂板鍒告暟閲� + * @param typeEnum + * @param preDay * @return */ - public List<Map<String, Object>> getFreeCouponMoneyToCharts(Integer dateType, String year, String startTime, - String endTime, String couponType); + public BigDecimal countCouponNumByDay(CouponTypeEnum typeEnum, String preDay); } -- Gitblit v1.8.0