From b3da9f82b7740d39742fef1a81a56c22fe1c8b9c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 08 六月 2020 17:27:02 +0800
Subject: [PATCH] 券后价调整

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java |   49 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 47 insertions(+), 2 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 ebc38db..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
@@ -183,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);
@@ -198,7 +198,52 @@
 	 */
 	public long countMyDirectOrderByCashArrival(Long uid, BigDecimal payment);
 
+	/**
+	 * 缁熻璁㈠崟鏁伴噺
+	 * @param uid
+	 * @param time 涓嬪崟寮�濮嬫椂闂�
+	 * @param payment 浠樻閲戦
+	 * @param type 璁㈠崟绫诲瀷  1鑷喘 2鍒嗕韩
+	 * @return
+	 */
+	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