From 011d53f9f3d08af8cd622585ce40eb880f313aaf Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期三, 25 九月 2019 12:02:57 +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 | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 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 a1678fa..49aaf9a 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 @@ -29,6 +29,7 @@ /** * 缁熻鐢ㄦ埛绾㈠寘鏁伴噺 + * * @param uid * @return */ @@ -151,6 +152,7 @@ /** * 濂栧姳鍒搁噾棰� + * * @return */ public BigDecimal countRebateCouponMoney(); @@ -168,5 +170,18 @@ * @return */ public long countShareOrInviteOrder(Long uid); + + /** + * 缁熻宸插埌璐� + * + * @param uid + * @param typeList + * @param minGetTime + * @param maxGetTime + * @return + */ + public BigDecimal sumAlreadyGetMoneyByUid(Long uid, List<Integer> typeList, Date minGetTime, Date maxGetTime); + + public long countAlreadyGetMoneyByUid(Long uid, List<Integer> typeList, Date minGetTime, Date maxGetTime); } -- Gitblit v1.8.0