From e7920b14a9baab97035a1a529da85d124a2bcacd Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期二, 16 六月 2020 10:54:29 +0800 Subject: [PATCH] 云发单对测试用户显示 --- fanli/src/main/java/com/yeshi/fanli/service/inter/count/UserSystemCouponCountService.java | 47 +++++++++++------------------------------------ 1 files changed, 11 insertions(+), 36 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 3fff6a7..b001ee0 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 @@ -3,7 +3,6 @@ import java.math.BigDecimal; import java.util.List; -import com.yeshi.fanli.dto.ChartTDO; import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum; import com.yeshi.fanli.vo.user.SystemCouponVO; import com.yeshi.fanli.vo.user.UserSystemCouponCountVO; @@ -75,41 +74,7 @@ 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 - * @return - */ - public List<ChartTDO> getRebateCouponUsedNumToCharts(Integer dateType, String year, String startTime, - String endTime); - - /** - * 濂栧姳鍒镐娇鐢ㄦ垚鍔熼噾棰濇洸绾垮浘 - * @param dateType - * @param year - * @param startTime - * @param endTime - * @return - */ - public List<ChartTDO> getRebateCouponMoneyToCharts(Integer dateType, String year, String startTime, - String endTime); - - /** - * 缁熻鍏嶅崟鍒搁噾棰� - * @param dateType - * @param year - * @param startTime - * @param endTime - * @param couponType - * @return - */ - public List<ChartTDO> getFreeCouponMoneyToCharts(Integer dateType, String year, String startTime, - String endTime, String couponType); - + /** * 鏍规嵁鍒哥被鍨� 缁熻鍏嶅崟閲戦 @@ -133,5 +98,15 @@ * @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); } -- Gitblit v1.8.0