From 32f8ab2806fb088335e24983477f5179064ada9d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 29 十一月 2019 17:37:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java |   15 +++++++++++++--
 1 files changed, 13 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..0b0dfc0 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,13 @@
 	}
 	
 	@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 getRewardMoneyByDate(Long uid, Integer dateType, Integer hbType, Integer orderState) {
+		return hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, orderState);
+	}
+	
 }

--
Gitblit v1.8.0