From b9e13ab776a64f9f264e9ac74cfae0134a371b61 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期一, 25 十一月 2019 16:12:00 +0800 Subject: [PATCH] 品牌 版本区分2.0.2 --- fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 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 4ea0395..1c70a3e 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 @@ -184,21 +184,28 @@ public long countAlreadyGetMoneyByUid(Long uid, List<Integer> typeList, Date minGetTime, Date maxGetTime); - /** - * 鏌ヨ鏉ユ簮璇ヤ笅绾ф垚鍔熷垎浜閲戞椿鍔� + /** + * 鏌ヨ鏉ユ簮璇ヤ笅绾ф垚鍔熷垎浜� + 鑷喘璁㈠崟 * @param uid * @param teamUid * @param endTime * @return */ - public BigDecimal getShareRewardByTeamUid(Long uid, Long teamUid, Date endTime); + public BigDecimal getOrderRewardByTeamUid(Long uid, Long teamUid, Date endTime); /** - * 缁熻涓嬬骇涓婁釜鏈夋晥璁㈠崟 + * 缁熻璇ヤ笅绾ф垚鍔熷垎浜� + 鑷喘璁㈠崟 * @param uid * @param teamUid 涓嬬骇id * @return */ - public BigDecimal getShareRewardByTeamUidLastMonth(Long uid, Long teamUid); + public BigDecimal getOrderRewardByTeamUidTheMonth(Long uid, Long teamUid); + + /** + * 鑷喘杩斿埄鍒拌处閲戦 + * @param uid + * @return + */ + public BigDecimal getRewardMoneyBySelf(Long uid); } -- Gitblit v1.8.0