From 271ae63c20fcbe28d29c47f1881138ff6551a2a1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 六月 2020 19:26:26 +0800
Subject: [PATCH] 唯品会订单bug修复，APP端佣金比例展示错误bug修复

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java |   60 ++++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 46 insertions(+), 14 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 0cdc1d6..4d111e5 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
@@ -10,7 +10,6 @@
 import org.springframework.stereotype.Service;
 
 import com.yeshi.fanli.dao.mybatis.HongBaoV2CountMapper;
-import com.yeshi.fanli.dto.ChartTDO;
 import com.yeshi.fanli.entity.bus.user.HongBaoV2;
 import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
 import com.yeshi.fanli.vo.order.HongBaoV2VO;
@@ -18,6 +17,8 @@
 @Service
 public class HongBaoV2CountServiceImpl implements HongBaoV2CountService {
 
+	
+	
 	@Resource
 	private HongBaoV2CountMapper hongBaoV2CountMapper;
 
@@ -138,18 +139,10 @@
 		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);
+	public long countMyDirectOrderByCashArrival(Long uid, BigDecimal payment) {
+		Long count = hongBaoV2CountMapper.countMyDirectOrderByCashArrival(uid, payment, null);
 		if (count == null) {
 			count = 0L;
 		}
@@ -158,19 +151,31 @@
 	
 	
 	@Override
-	public long counOrderByUidAndOrderType(Long uid, BigDecimal payment,int type) {
-		Long count = hongBaoV2CountMapper.counOrderByUidAndOrderType(uid, payment, type);
+	public long countMyDirectOrderByCashArrival(Long uid, BigDecimal payment, Integer type) {
+		Long count = hongBaoV2CountMapper.countMyDirectOrderByCashArrival(uid, payment, type);
 		if (count == null) {
 			count = 0L;
 		}
 		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) {
-		return hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, null, null, null, null, null, listSource);
+		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) {
@@ -188,4 +193,31 @@
 				startTime, endTime, listSource);
 	}
 	
+	
+	@Override
+	public BigDecimal sumMoneyArrivalByUidAndNearDay(Long uid, int day) {
+		return hongBaoV2CountMapper.sumMoneyArrivalByUidAndNearDay(uid, day);
+	}
+	
+	
+	@Override
+	public BigDecimal sumMoneyBySettleTimeAndUid(Long uid, Date minDate, Date maxDate) {
+		 BigDecimal money = hongBaoV2CountMapper.sumMoneyBySettleTimeAndUid(uid, minDate, maxDate);
+		 if (money == null) {
+			 money = new BigDecimal(0);
+		 }
+		 return money;
+	}
+	
+	@Override
+	public BigDecimal sumMoneyByANotSettleAndUid(Long uid) {
+		 BigDecimal money = hongBaoV2CountMapper.sumMoneyByANotSettleAndUid(uid);
+		 if (money == null) {
+			 money = new BigDecimal(0);
+		 }
+		 return money;
+	}
+	
+	
+	
 }

--
Gitblit v1.8.0