From eda623f37c3260f4b4657e34a8a39798c72432b1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 28 六月 2020 15:49:14 +0800
Subject: [PATCH] 搜索接口增加小黄条返回

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java |   35 +++++++++++++++++++++++------------
 1 files changed, 23 insertions(+), 12 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 470478f..ada4f71 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
@@ -17,6 +17,8 @@
 @Service
 public class HongBaoV2CountServiceImpl implements HongBaoV2CountService {
 
+	
+	
 	@Resource
 	private HongBaoV2CountMapper hongBaoV2CountMapper;
 
@@ -157,26 +159,19 @@
 		return count;
 	}
 	
-	@Override
-	public long countMyDirectOrderByCashNotArrival(Long uid, BigDecimal payment, Integer type) {
-		Long count = hongBaoV2CountMapper.countMyDirectOrderByCashNotArrival(uid, payment, type);
-		if (count == null) {
-			count = 0L;
-		}
-		return count;
-	}
 	
 	@Override
 	public BigDecimal getRewardMoneyToCount(Long uid, Integer dateType, Integer hbType, List<Integer> listSource) {
-		BigDecimal money = hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, null, null, null, null, null, listSource,false);
+		BigDecimal money = hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, null, null, null, null, null, listSource);
 		if (money == null)
 			money = BigDecimal.ZERO;
 		 return money;
 	}
 	
+	
 	@Override
 	public BigDecimal geBonusByuid(Long uid, Integer dateType, Integer hbType, Integer moneyState) {
-		 BigDecimal money = hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, null, null, moneyState, null, null, null,false);
+		 BigDecimal money = hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, null, null, moneyState, null, null, null);
 		 if (money == null) {
 			 money = new BigDecimal(0);
 		 }
@@ -185,9 +180,9 @@
 	
 	@Override
 	public BigDecimal getRewardMoneyByToSearch(Long uid, Integer dateType, Integer orderType, Integer orderState,
-			String orderNo,  Integer moneyState, String startTime,  String endTime, List<Integer> listSource, boolean notBackSuVip) {
+			String orderNo,  Integer moneyState, String startTime,  String endTime, List<Integer> listSource) {
 		return hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, orderType, orderState, orderNo, moneyState, 
-				startTime, endTime, listSource, notBackSuVip);
+				startTime, endTime, listSource);
 	}
 	
 	
@@ -215,6 +210,22 @@
 		 return money;
 	}
 	
+	@Override
+	public long countOrderByCashArrival(Long uid, BigDecimal payment, Integer type, Integer dateType) {
+		Long count = hongBaoV2CountMapper.countOrderByCashArrival(uid, payment, type, dateType);
+		if (count == null) {
+			count = 0L;
+		}
+		return count;
+	}
 	
+	@Override
+	public long countOrderByCashNotArrival(Long uid, BigDecimal payment, Integer type, Integer dateType) {
+		Long count = hongBaoV2CountMapper.countOrderByCashNotArrival(uid, payment, type, dateType);
+		if (count == null) {
+			count = 0L;
+		}
+		return count;
+	}
 	
 }

--
Gitblit v1.8.0