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 |   15 +++++++++++++--
 1 files changed, 13 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 166fd28..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
@@ -264,7 +264,7 @@
 			 Integer moneyState, String startTime, String endTime, List<Integer> listSource);
 
 	
-	public Integer countOrderByTypeAndDate(Integer orderType, String preDay);
+	public Long countOrderByTypeAndDate(Integer orderType, String preDay);
 
 	/**
 	 * 缁熻璁㈠崟鏁伴噺
@@ -274,6 +274,17 @@
 	 * @param type 璁㈠崟绫诲瀷
 	 * @return
 	 */
-	public long counOrderByUidAndOrderType(Long uid, BigDecimal payment, int type);
+	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