From e65037e672ecab852e2a6c5b242cdadfd1a58b33 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 25 十一月 2019 09:30:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java
index 2cf2eb3..17090c0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java
@@ -297,13 +297,13 @@
return hongBaoV2CountMapper.countAlreadyGetMoneyByUid(uid, typeList, minGetTime, maxGetTime);
}
- @Override
- public BigDecimal getShareRewardByTeamUid(Long uid, Long teamUid, Date endTime) {
- return hongBaoV2CountMapper.getShareRewardByTeamUid(uid, teamUid, endTime);
+ @Override
+ public BigDecimal getOrderRewardByTeamUid(Long uid, Long teamUid, Date endTime) {
+ return hongBaoV2CountMapper.getOrderRewardByTeamUid(uid, teamUid, endTime);
}
@Override
- public BigDecimal getShareRewardByTeamUidLastMonth(Long uid, Long teamUid) {
- return hongBaoV2CountMapper.getShareRewardByTeamUidLastMonth(uid, teamUid);
+ public BigDecimal getOrderRewardByTeamUidTheMonth(Long uid, Long teamUid) {
+ return hongBaoV2CountMapper.getOrderRewardByTeamUidTheMonth(uid, teamUid);
}
}
--
Gitblit v1.8.0