From 49ed4f4521ce433a14810a0119bf3f2f7f6e606a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 21 五月 2020 17:42:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java | 20 +++++++++++++++++++-
1 files changed, 19 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 8704f84..bfc3bcb 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
@@ -140,7 +140,7 @@
@Override
public long countMyDirectOrderByCashArrival(Long uid, BigDecimal payment) {
- Long count = hongBaoV2CountMapper.countMyDirectOrderByCashArrival(uid, payment);
+ Long count = hongBaoV2CountMapper.countMyDirectOrderByCashArrival(uid, payment, null);
if (count == null) {
count = 0L;
}
@@ -149,6 +149,24 @@
@Override
+ public long countMyDirectOrderByCashArrival(Long uid, BigDecimal payment, Integer type) {
+ Long count = hongBaoV2CountMapper.countMyDirectOrderByCashArrival(uid, payment, type);
+ if (count == null) {
+ count = 0L;
+ }
+ return count;
+ }
+
+ @Override
+ public long countMyDirectOrderByCashNotArrival(Long uid, BigDecimal payment, Integer type) {
+ Long count = hongBaoV2CountMapper.countMyDirectOrderByCashNotArrival(uid, payment, type);
+ if (count == null) {
+ count = 0L;
+ }
+ return count;
+ }
+
+ @Override
public BigDecimal getRewardMoneyToCount(Long uid, Integer dateType, Integer hbType, List<Integer> listSource) {
BigDecimal money = hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, null, null, null, null, null, listSource);
if (money == null)
--
Gitblit v1.8.0