From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java |   85 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 84 insertions(+), 1 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 9e860d2..8b8e642 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
@@ -168,6 +168,15 @@
 		return hongBaoV2CountMapper.countHongBaoType(dateType, type, year, startTime, endTime);
 	}
 
+	
+	
+	@Override
+	public Long 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 {
@@ -237,6 +246,11 @@
 	@Override
 	public int getTotalTiChengCount(Long uid) {
 		return hongBaoV2CountMapper.getTotalTiChengCount(uid);
+	}
+	
+	@Override
+	public long getHongBaoCount(Long uid,Integer type) {
+		return hongBaoV2CountMapper.getHongBaoCount(uid, type);
 	}
 
 	@Override
@@ -311,7 +325,76 @@
 	@Override
 	public BigDecimal getRewardMoneyBySelf(Long uid) {
 		List<Integer> list = new ArrayList<Integer>();
-		list.add(HongBaoV2.STATE_YILINGQU);
+		list.add(HongBaoV2.TYPE_ZIGOU);
 		return hongBaoV2CountMapper.getRewardMoneyByUid(uid, list);
 	}
+	
+	@Override
+	public BigDecimal getRewardMoneyByShare(Long uid) {
+		List<Integer> list = new ArrayList<Integer>();
+		list.add(HongBaoV2.TYPE_SHARE_GOODS);
+		return hongBaoV2CountMapper.getRewardMoneyByUid(uid, list);
+	}
+	
+	
+	@Override
+	public BigDecimal getRewardMoneyByInvite(Long uid) {
+		List<Integer> list = new ArrayList<Integer>();
+		list.add(HongBaoV2.TYPE_YIJI);
+		list.add(HongBaoV2.TYPE_ERJI);
+		list.add(HongBaoV2.TYPE_SHARE_YIJI);
+		list.add(HongBaoV2.TYPE_SHARE_ERJI);
+		return hongBaoV2CountMapper.getRewardMoneyByUid(uid, list);
+	}
+	
+	@Override
+	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 countOrderByUidAndSettled(Long uid, Long time, BigDecimal payment) {
+		Long count = hongBaoV2CountMapper.countOrderByUidAndSettled(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);
+	}
+	
+	@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);
+		 if (money == null) {
+			 money = new BigDecimal(0);
+		 }
+		 return money;
+	}
+	
+	@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