From f15acf7f2d57db3a32c574b0dfc21f564dca6024 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 12:01:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 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 706c81c..49a2f9e 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
@@ -169,6 +169,15 @@
return hongBaoV2CountMapper.countHongBaoType(dateType, type, year, startTime, endTime);
}
+
+
+ @Override
+ public Integer countOrderByTypeAndDate(Integer orderType, String preDay) {
+ return hongBaoV2CountMapper.countOrderByTypeAndDate(orderType, preDay);
+ }
+
+
+
@Override
public List<ChartTDO> getProportionByType(Integer dateType, Integer type, String year, String startTime,
String endTime) throws Exception {
@@ -340,20 +349,36 @@
}
@Override
- public long countValidOrderTeamUserByUid(Long uid, Long time, BigDecimal payment) {
- return hongBaoV2CountMapper.countValidOrderTeamUserByUid(uid, time, payment);
- }
-
- @Override
- public BigDecimal getRewardMoneyToCount(Long uid, Integer dateType, Integer hbType) {
- return hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, null, null, null, null, null);
+ 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 BigDecimal getRewardMoneyByToSearch(Long uid, Integer dateType, Integer hbType, Integer orderState, String orderNo, Integer source, String startTime, String endTime) {
- return hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, orderState, orderNo, source,
- startTime, endTime);
+ public long counOrderByUidAndOrderType(Long uid, BigDecimal payment,int type) {
+ Long count = hongBaoV2CountMapper.counOrderByUidAndOrderType(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);
+ }
+
+
+ @Override
+ public BigDecimal getRewardMoneyByToSearch(Long uid, Integer dateType, Integer orderType, Integer orderState,
+ String orderNo, Integer moneyState, String startTime, String endTime, List<Integer> listSource) {
+ return hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, orderType, orderState, orderNo, moneyState,
+ startTime, endTime, listSource);
}
}
--
Gitblit v1.8.0