From 2f2860b50f24e5e3598d223db03d43df61d95c97 Mon Sep 17 00:00:00 2001 From: yj <Administrator@192> Date: 星期五, 13 三月 2020 16:31:30 +0800 Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div --- fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java index 76a48e0..5952114 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java @@ -229,7 +229,7 @@ * @param payment * @return */ - public long countValidOrderTeamUserByUid(Long uid, Long time, BigDecimal payment); + public long countValidOrderByUidAndTime(Long uid, Long time, BigDecimal payment); /** * 缁熻涓嶅悓鏃堕棿锛氬鍔� @@ -238,7 +238,7 @@ * @param hbType * @return */ - public BigDecimal getRewardMoneyToCount(Long uid, Integer dateType, Integer hbType); + public BigDecimal getRewardMoneyToCount(Long uid, Integer dateType, Integer hbType, List<Integer> listSource); /** * 缁熻绾㈠寘涓暟 @@ -261,6 +261,9 @@ * @return */ public BigDecimal getRewardMoneyByToSearch(Long uid, Integer dateType, Integer hbType, Integer orderState, String orderNo, - Integer moneyState, Integer source, String startTime, String endTime); + Integer moneyState, String startTime, String endTime, List<Integer> listSource); + + + public Integer countOrderByTypeAndDate(Integer orderType, String preDay); } -- Gitblit v1.8.0