From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java |   57 +++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java
index 977d1e5..d534cce 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java
@@ -152,14 +152,6 @@
 	 */
 	public BigDecimal getRewardMoneyByInvite(Long uid);
 
-	/**
-	 * 鏈夋晥涓�绾ч槦鍛樺畾涔夛細2019骞�1鏈�1鏃ヨ捣(date)锛岃嚜璐垨鍒嗕韩1绗斾笖浠樻鎬婚噾棰濅笉灏忎簬 payment 鍏冿紙閫�娆句负澶辨晥
-	 * @param uid
-	 * @param date
-	 * @param payment
-	 * @return
-	 */
-	public long countValidOrderByUidAndTime(Long uid, Long time, BigDecimal payment);
 
 	/**
 	 * 缁熻涓嶅悓鏃堕棿锛氬鍔�
@@ -191,7 +183,7 @@
 	 * @return
 	 */
 	public BigDecimal getRewardMoneyByToSearch(Long uid, Integer dateType, Integer hbType, Integer orderState, String orderNo,
-			 Integer moneyState, String startTime, String endTime, List<Integer> listSource);
+			 Integer moneyState, String startTime, String endTime, List<Integer> listSource, boolean notBackSuVip);
 
 	
 	public Long countOrderByTypeAndDate(Integer orderType, String preDay);
@@ -207,14 +199,51 @@
 	public long countMyDirectOrderByCashArrival(Long uid, BigDecimal payment);
 
 	/**
-	 * 缁熻宸茬粨绠�
+	 * 缁熻璁㈠崟鏁伴噺
 	 * @param uid
-	 * @param time
-	 * @param payment
+	 * @param time 涓嬪崟寮�濮嬫椂闂�
+	 * @param payment 浠樻閲戦
+	 * @param type 璁㈠崟绫诲瀷  1鑷喘 2鍒嗕韩
 	 * @return
 	 */
-	public long countOrderByUidAndSettled(Long uid, Long time, BigDecimal payment);
+	public long countMyDirectOrderByCashArrival(Long uid, BigDecimal payment, Integer type);
+	
+	
 
-	public BigDecimal geBonusByuid(Long uid, Integer dateType, Integer hbType, Integer moneyState);
+	public BigDecimal geBonusByuid(Long uid, Integer dateType, Integer hbType, Integer moneyState);
+
+	/**
+	 * 缁熻杩戞棩鍒拌处鏀跺叆閲戦
+	 * @param uid
+	 * @param day
+	 * @return
+	 */
+	public BigDecimal sumMoneyArrivalByUidAndNearDay(Long uid, int day);
+
+	/**
+	 * 缁熻鏀惰揣閲戦
+	 * @param uid
+	 * @param minDate
+	 * @param maxDate
+	 * @return
+	 */
+	public BigDecimal sumMoneyBySettleTimeAndUid(Long uid, Date minDate, Date maxDate);
+
+	
+	/**
+	 * 180澶╁唴鏈敹璐х殑閲戦
+	 * @param uid
+	 * @return
+	 */
+	public BigDecimal sumMoneyByANotSettleAndUid(Long uid);
+
+	/**
+	 * 缁熻鏈埌璐︾殑鏁伴噺
+	 * @param uid
+	 * @param payment
+	 * @param type
+	 * @return
+	 */
+	public long countMyDirectOrderByCashNotArrival(Long uid, BigDecimal payment, Integer type);
 
 }

--
Gitblit v1.8.0