From 0a63d22e38a644bc83b393ed85618b04d3be858b Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 03 一月 2020 12:22:30 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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 b5f3b2f..d6fc927 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
@@ -238,6 +238,11 @@
public int getTotalTiChengCount(Long uid) {
return hongBaoV2CountMapper.getTotalTiChengCount(uid);
}
+
+ @Override
+ public long getHongBaoCount(Long uid,Integer type) {
+ return hongBaoV2CountMapper.getHongBaoCount(uid, type);
+ }
@Override
public long countValidNumberByUid(Long uid, Integer dateType) {
@@ -334,7 +339,21 @@
}
@Override
- public long countValidOrderTeamUserByUid(Long uid, String date, BigDecimal payment) {
- return hongBaoV2CountMapper.countValidOrderTeamUserByUid(uid, date, payment);
+ 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, 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