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 |   24 ++++++++++++++++++++++--
 1 files changed, 22 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 eb69a6b..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,6 +198,17 @@
 	 */
 	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);
 
@@ -224,6 +235,15 @@
 	 * @param uid
 	 * @return
 	 */
-	public BigDecimal sumMoneyByANotSettleAndUid(Long uid);
+	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