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/inter/count/HongBaoV2CountService.java |   30 +++++++++++++++++++++++++++---
 1 files changed, 27 insertions(+), 3 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 76a48e0..06ea48a 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
@@ -229,7 +229,7 @@
 	 * @param payment
 	 * @return
 	 */
-	public long countValidOrderTeamUserByUid(Long uid, Long time, BigDecimal payment);
+	public long countValidOrderByUidAndTime(Long uid, Long time, BigDecimal payment);
 
 	/**
 	 * 缁熻涓嶅悓鏃堕棿锛氬鍔�
@@ -238,7 +238,7 @@
 	 * @param hbType
 	 * @return
 	 */
-	public BigDecimal getRewardMoneyToCount(Long uid, Integer dateType, Integer hbType);
+	public BigDecimal getRewardMoneyToCount(Long uid, Integer dateType, Integer hbType, List<Integer> listSource);
 
 	/**
 	 * 缁熻绾㈠寘涓暟
@@ -261,6 +261,30 @@
 	 * @return
 	 */
 	public BigDecimal getRewardMoneyByToSearch(Long uid, Integer dateType, Integer hbType, Integer orderState, String orderNo,
-			 Integer moneyState, Integer source, String startTime, String endTime);
+			 Integer moneyState, String startTime, String endTime, List<Integer> listSource);
+
+	
+	public Long countOrderByTypeAndDate(Integer orderType, String preDay);
+
+	/**
+	 * 缁熻璁㈠崟鏁伴噺
+	 * @param uid
+	 * @param time 涓嬪崟寮�濮嬫椂闂�
+	 * @param payment 浠樻閲戦
+	 * @param type 璁㈠崟绫诲瀷
+	 * @return
+	 */
+	public long counOrderByUidAndOrderType(Long uid, BigDecimal payment, int type);
+
+	/**
+	 * 缁熻宸茬粨绠�
+	 * @param uid
+	 * @param time
+	 * @param payment
+	 * @return
+	 */
+	public long countOrderByUidAndSettled(Long uid, Long time, BigDecimal payment);
+
+	public BigDecimal geBonusByuid(Long uid, Integer dateType, Integer hbType, Integer moneyState);
 
 }

--
Gitblit v1.8.0