From 0a63d22e38a644bc83b393ed85618b04d3be858b Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期五, 03 一月 2020 12:22: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 | 19 +++++++++++++++++-- 1 files changed, 17 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 f2a00e4b..56ee47c 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 @@ -238,7 +238,7 @@ * @param hbType * @return */ - public BigDecimal getRewardMoneyByDate(Long uid, Integer dateType, Integer hbType, Integer orderState); + public BigDecimal getRewardMoneyToCount(Long uid, Integer dateType, Integer hbType, List<Integer> listSource); /** * 缁熻绾㈠寘涓暟 @@ -246,6 +246,21 @@ * @param type 绾㈠寘绫诲瀷 * @return */ - public long getHongBaoCount(Long uid, Integer type); + public long getHongBaoCount(Long uid, Integer type); + + /** + * 绛涢�夌粨鏋滈〉椤堕儴缁熻 + * @param uid + * @param dateType + * @param hbType + * @param orderState + * @param orderNo + * @param source + * @param startTime + * @param endTime + * @return + */ + public BigDecimal getRewardMoneyByToSearch(Long uid, Integer dateType, Integer hbType, Integer orderState, String orderNo, + Integer moneyState, String startTime, String endTime, List<Integer> listSource); } -- Gitblit v1.8.0