From 88c7df1d5089d8e39f356a68eaccc18f308e190c Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期二, 24 三月 2020 12:10:07 +0800 Subject: [PATCH] Merge branch 'div' into div-1 --- fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 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 aed93af..606946d 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); /** * 缁熻涓嶅悓鏃堕棿锛氬鍔� @@ -264,6 +264,16 @@ Integer moneyState, String startTime, String endTime, List<Integer> listSource); - public Integer countOrderByTypeAndDate(Integer orderType, String preDay); + public Long countOrderByTypeAndDate(Integer orderType, String preDay); + + /** + * 缁熻璁㈠崟鏁伴噺 + * @param uid + * @param time 涓嬪崟寮�濮嬫椂闂� + * @param payment 浠樻閲戦 + * @param type 璁㈠崟绫诲瀷 + * @return + */ + public long counOrderByUidAndOrderType(Long uid, BigDecimal payment, int type); } -- Gitblit v1.8.0