From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java | 76 ++++++++++++++++++++++++++-----------
1 files changed, 53 insertions(+), 23 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 3272ee6..470478f 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
@@ -137,28 +137,10 @@
return hongBaoV2CountMapper.getRewardMoneyByUid(uid, list);
}
- @Override
- public long countValidOrderByUidAndTime(Long uid, Long time, BigDecimal payment) {
- Long count = hongBaoV2CountMapper.countValidOrderByUidAndTime(uid, time, payment);
- if (count == null) {
- count = 0L;
- }
- return count;
- }
-
- @Override
- public long countOrderByUidAndSettled(Long uid, Long time, BigDecimal payment) {
- Long count = hongBaoV2CountMapper.countOrderByUidAndSettled(uid, time, payment);
- if (count == null) {
- count = 0L;
- }
- return count;
- }
-
@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;
}
@@ -167,13 +149,34 @@
@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) {
- return hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, null, null, null, null, null, listSource);
+ BigDecimal money = hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, null, null, null, null, null, listSource,false);
+ if (money == null)
+ money = BigDecimal.ZERO;
+ return money;
}
@Override
public BigDecimal geBonusByuid(Long uid, Integer dateType, Integer hbType, Integer moneyState) {
- BigDecimal money = hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, null, null, moneyState, null, null, null);
+ BigDecimal money = hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, null, null, moneyState, null, null, null,false);
if (money == null) {
money = new BigDecimal(0);
}
@@ -182,9 +185,36 @@
@Override
public BigDecimal getRewardMoneyByToSearch(Long uid, Integer dateType, Integer orderType, Integer orderState,
- String orderNo, Integer moneyState, String startTime, String endTime, List<Integer> listSource) {
+ String orderNo, Integer moneyState, String startTime, String endTime, List<Integer> listSource, boolean notBackSuVip) {
return hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, orderType, orderState, orderNo, moneyState,
- startTime, endTime, listSource);
+ startTime, endTime, listSource, notBackSuVip);
}
+
+ @Override
+ public BigDecimal sumMoneyArrivalByUidAndNearDay(Long uid, int day) {
+ return hongBaoV2CountMapper.sumMoneyArrivalByUidAndNearDay(uid, day);
+ }
+
+
+ @Override
+ public BigDecimal sumMoneyBySettleTimeAndUid(Long uid, Date minDate, Date maxDate) {
+ BigDecimal money = hongBaoV2CountMapper.sumMoneyBySettleTimeAndUid(uid, minDate, maxDate);
+ if (money == null) {
+ money = new BigDecimal(0);
+ }
+ return money;
+ }
+
+ @Override
+ public BigDecimal sumMoneyByANotSettleAndUid(Long uid) {
+ BigDecimal money = hongBaoV2CountMapper.sumMoneyByANotSettleAndUid(uid);
+ if (money == null) {
+ money = new BigDecimal(0);
+ }
+ return money;
+ }
+
+
+
}
--
Gitblit v1.8.0