From 6a47350594a4843f6cc36e5c94902d6fa97a6d4a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 15 六月 2020 16:33:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 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 76698d0..33d9d6f 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
@@ -239,13 +239,26 @@
 	 */
 	public BigDecimal sumMoneyByANotSettleAndUid(Long uid);
 
+	
+
 	/**
-	 * 缁熻鏈埌璐︾殑鏁伴噺
+	 * 缁熻宸插埌璐﹁鍗曟暟閲�
 	 * @param uid
-	 * @param payment
-	 * @param type
+	 * @param payment -浠樻閲戦
+	 * @param type -绫诲瀷锛� 1鑷喘 2鍒嗕韩 3閭�璇�  4鑷喘+鍒嗕韩   
+	 * @param dateType 1鏈湀
 	 * @return
 	 */
-	public long countMyDirectOrderByCashNotArrival(Long uid, BigDecimal payment, Integer type);
+	public long countOrderByCashArrival(Long uid, BigDecimal payment, Integer type, Integer dateType);
+	
+	/**
+	 * 缁熻鏈埌璐﹁鍗曟暟閲�
+	 * @param uid
+	 * @param payment -浠樻閲戦
+	 * @param type -绫诲瀷锛� 1鑷喘 2鍒嗕韩 3閭�璇�  4鑷喘+鍒嗕韩   
+	 * @param dateType 1鏈湀
+	 * @return
+	 */
+	public long countOrderByCashNotArrival(Long uid, BigDecimal payment, Integer type, Integer dateType);
 
 }

--
Gitblit v1.8.0