From 744594ef1a2f530fc3e86ea9dc48b62247f79420 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 19 五月 2020 17:13:23 +0800
Subject: [PATCH] 饿了么绘图，添加口碑

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java |   37 +++++++++++++++++++++++--------------
 1 files changed, 23 insertions(+), 14 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 f800284..eb69a6b 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
@@ -152,14 +152,6 @@
 	 */
 	public BigDecimal getRewardMoneyByInvite(Long uid);
 
-	/**
-	 * 鏈夋晥涓�绾ч槦鍛樺畾涔夛細2019骞�1鏈�1鏃ヨ捣(date)锛岃嚜璐垨鍒嗕韩1绗斾笖浠樻鎬婚噾棰濅笉灏忎簬 payment 鍏冿紙閫�娆句负澶辨晥
-	 * @param uid
-	 * @param date
-	 * @param payment
-	 * @return
-	 */
-	public long countValidOrderByUidAndTime(Long uid, Long time, BigDecimal payment);
 
 	/**
 	 * 缁熻涓嶅悓鏃堕棿锛氬鍔�
@@ -204,17 +196,34 @@
 	 * @param type 璁㈠崟绫诲瀷
 	 * @return
 	 */
-	public long counOrderByUidAndOrderType(Long uid, BigDecimal payment, int type);
+	public long countMyDirectOrderByCashArrival(Long uid, BigDecimal payment);
+
+
+	public BigDecimal geBonusByuid(Long uid, Integer dateType, Integer hbType, Integer moneyState);
 
 	/**
-	 * 缁熻宸茬粨绠�
+	 * 缁熻杩戞棩鍒拌处鏀跺叆閲戦
 	 * @param uid
-	 * @param time
-	 * @param payment
+	 * @param day
 	 * @return
 	 */
-	public long countOrderByUidAndSettled(Long uid, Long time, BigDecimal payment);
+	public BigDecimal sumMoneyArrivalByUidAndNearDay(Long uid, int day);
 
-	public BigDecimal geBonusByuid(Long uid, Integer dateType, Integer hbType, Integer moneyState);
+	/**
+	 * 缁熻鏀惰揣閲戦
+	 * @param uid
+	 * @param minDate
+	 * @param maxDate
+	 * @return
+	 */
+	public BigDecimal sumMoneyBySettleTimeAndUid(Long uid, Date minDate, Date maxDate);
+
+	
+	/**
+	 * 180澶╁唴鏈敹璐х殑閲戦
+	 * @param uid
+	 * @return
+	 */
+	public BigDecimal sumMoneyByANotSettleAndUid(Long uid);
 
 }

--
Gitblit v1.8.0