From 6a47350594a4843f6cc36e5c94902d6fa97a6d4a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 15 六月 2020 16:33:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 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 4d111e5..ada4f71 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
@@ -159,14 +159,6 @@
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) {
@@ -218,6 +210,22 @@
return money;
}
+ @Override
+ public long countOrderByCashArrival(Long uid, BigDecimal payment, Integer type, Integer dateType) {
+ Long count = hongBaoV2CountMapper.countOrderByCashArrival(uid, payment, type, dateType);
+ if (count == null) {
+ count = 0L;
+ }
+ return count;
+ }
+ @Override
+ public long countOrderByCashNotArrival(Long uid, BigDecimal payment, Integer type, Integer dateType) {
+ Long count = hongBaoV2CountMapper.countOrderByCashNotArrival(uid, payment, type, dateType);
+ if (count == null) {
+ count = 0L;
+ }
+ return count;
+ }
}
--
Gitblit v1.8.0