From dcfd801ea435c1c87ed47f2ee24cdabaaf230d6f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 31 三月 2020 12:15:56 +0800
Subject: [PATCH] 大淘客商品过滤修改

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java |   34 +++++++++++++++++++++++++++++++---
 1 files changed, 31 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 f2a00e4b..166fd28 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 getRewardMoneyByDate(Long uid, Integer dateType, Integer hbType, Integer orderState);
+	public BigDecimal getRewardMoneyToCount(Long uid, Integer dateType, Integer hbType, List<Integer> listSource);
 
 	/**
 	 * 缁熻绾㈠寘涓暟
@@ -246,6 +246,34 @@
 	 * @param type 绾㈠寘绫诲瀷
 	 * @return
 	 */
-	public long getHongBaoCount(Long uid, Integer type);
+	public long getHongBaoCount(Long uid, Integer type);
+
+	/**
+	 * 绛涢�夌粨鏋滈〉椤堕儴缁熻
+	 * @param uid
+	 * @param dateType
+	 * @param hbType
+	 * @param orderState
+	 * @param orderNo
+	 * @param source
+	 * @param startTime
+	 * @param endTime
+	 * @return
+	 */
+	public BigDecimal getRewardMoneyByToSearch(Long uid, Integer dateType, Integer hbType, Integer orderState, String orderNo,
+			 Integer moneyState, String startTime, String endTime, List<Integer> listSource);
+
+	
+	public Integer countOrderByTypeAndDate(Integer orderType, String preDay);
+
+	/**
+	 * 缁熻璁㈠崟鏁伴噺
+	 * @param uid
+	 * @param time 涓嬪崟寮�濮嬫椂闂�
+	 * @param payment 浠樻閲戦
+	 * @param type 璁㈠崟绫诲瀷
+	 * @return
+	 */
+	public long counOrderByUidAndOrderType(Long uid, BigDecimal payment, int type);
 
 }

--
Gitblit v1.8.0