From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java | 55 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 33 insertions(+), 22 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 0cdc1d6..8704f84 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
@@ -10,7 +10,6 @@
import org.springframework.stereotype.Service;
import com.yeshi.fanli.dao.mybatis.HongBaoV2CountMapper;
-import com.yeshi.fanli.dto.ChartTDO;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.vo.order.HongBaoV2VO;
@@ -138,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 counOrderByUidAndOrderType(Long uid, BigDecimal payment,int type) {
- Long count = hongBaoV2CountMapper.counOrderByUidAndOrderType(uid, payment, type);
+ public long countMyDirectOrderByCashArrival(Long uid, BigDecimal payment) {
+ Long count = hongBaoV2CountMapper.countMyDirectOrderByCashArrival(uid, payment);
if (count == null) {
count = 0L;
}
@@ -169,7 +150,10 @@
@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);
+ if (money == null)
+ money = BigDecimal.ZERO;
+ return money;
}
@Override
@@ -188,4 +172,31 @@
startTime, endTime, listSource);
}
+
+ @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