From f0d06601a6be8c09ef5e8e7e76666cb1e8ef72a5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 三月 2020 16:41:55 +0800
Subject: [PATCH] 团队补贴按照下单时间兼容

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java |   19 +++++++++++++++++--
 1 files changed, 17 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 a344766..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
@@ -349,10 +349,25 @@
 	}
 	
 	@Override
-	public long countValidOrderTeamUserByUid(Long uid, Long time, BigDecimal payment) {
-		return hongBaoV2CountMapper.countValidOrderTeamUserByUid(uid, time, payment);
+	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 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);

--
Gitblit v1.8.0