From e97065519838a1ebbee870eefae6eae9f5d91647 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 26 十一月 2019 14:10:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 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 9e860d2..b5f3b2f 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
@@ -311,7 +311,30 @@
@Override
public BigDecimal getRewardMoneyBySelf(Long uid) {
List<Integer> list = new ArrayList<Integer>();
- list.add(HongBaoV2.STATE_YILINGQU);
+ list.add(HongBaoV2.TYPE_ZIGOU);
return hongBaoV2CountMapper.getRewardMoneyByUid(uid, list);
}
+
+ @Override
+ public BigDecimal getRewardMoneyByShare(Long uid) {
+ List<Integer> list = new ArrayList<Integer>();
+ list.add(HongBaoV2.TYPE_SHARE_GOODS);
+ return hongBaoV2CountMapper.getRewardMoneyByUid(uid, list);
+ }
+
+
+ @Override
+ public BigDecimal getRewardMoneyByInvite(Long uid) {
+ List<Integer> list = new ArrayList<Integer>();
+ list.add(HongBaoV2.TYPE_YIJI);
+ list.add(HongBaoV2.TYPE_ERJI);
+ list.add(HongBaoV2.TYPE_SHARE_YIJI);
+ list.add(HongBaoV2.TYPE_SHARE_ERJI);
+ return hongBaoV2CountMapper.getRewardMoneyByUid(uid, list);
+ }
+
+ @Override
+ public long countValidOrderTeamUserByUid(Long uid, String date, BigDecimal payment) {
+ return hongBaoV2CountMapper.countValidOrderTeamUserByUid(uid, date, payment);
+ }
}
--
Gitblit v1.8.0