From e7920b14a9baab97035a1a529da85d124a2bcacd Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 16 六月 2020 10:54:29 +0800
Subject: [PATCH] 云发单对测试用户显示

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java |   69 ++++++++++++++++++++++++++--------
 1 files changed, 52 insertions(+), 17 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java
index 7907995..8a44fad 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java
@@ -133,30 +133,38 @@
 	 */
 	BigDecimal getRewardMoneyByUid(@Param("uid") Long uid, @Param("list") List<Integer> list);
 	
-	/**
-	 *  娉細1.鏈夋晥涓�绾ч槦鍛樺畾涔夛細2019骞�1鏈�1鏃ヨ捣锛岃嚜璐垨鍒嗕韩1绗斾笖浠樻鎬婚噾棰濅笉灏忎簬 payment 鍏冿紙閫�娆句负澶辨晥
-	 * @param uid
-	 * @param list 绫诲瀷
-	 * @return
-	 */
-	Long countValidOrderByUidAndTime(@Param("uid") Long uid, @Param("limitTime") long limitTime,
-			@Param("payment") BigDecimal payment);
-	
-	
-	Long countOrderByUidAndSettled(@Param("uid") Long uid, @Param("limitTime") long limitTime,
-			@Param("payment") BigDecimal payment);
-	
 	
 	/**
 	 *  娉細1绗斾笖浠樻鎬婚噾棰濅笉灏忎簬 payment 鍏冿紙閫�娆句负澶辨晥
 	 * @param uid
-	 * @param list 绫诲瀷
+	 * @param payment
 	 * @return
 	 */
-	Long counOrderByUidAndOrderType(@Param("uid") Long uid, @Param("payment") BigDecimal payment,
-			@Param("type") int type);
+	Long countMyDirectOrderByCashArrival(@Param("uid") Long uid, @Param("payment") BigDecimal payment,
+			 @Param("type")Integer type);
+	
+	/**
+	 * 缁熻宸插埌璐﹁鍗曟暟閲�
+	 * @param uid
+	 * @param payment -浠樻閲戦
+	 * @param type -绫诲瀷锛� 1鑷喘 2鍒嗕韩 3閭�璇�  4鑷喘+鍒嗕韩   
+	 * @param dateType 1鏈湀
+	 * @return
+	 */
+	Long countOrderByCashArrival(@Param("uid") Long uid, @Param("payment") BigDecimal payment,
+			 @Param("type")Integer type, @Param("dateType")Integer dateType);
 	
 	
+	/**
+	 * 缁熻鏈埌璐﹁鍗曟暟閲�
+	 * @param uid
+	 * @param payment -浠樻閲戦
+	 * @param type -绫诲瀷锛� 1鑷喘 2鍒嗕韩 3閭�璇�  4鑷喘+鍒嗕韩   
+	 * @param dateType 1鏈湀
+	 * @return
+	 */
+	Long countOrderByCashNotArrival(@Param("uid") Long uid, @Param("payment") BigDecimal payment,
+			 @Param("type")Integer type, @Param("dateType")Integer dateType);
 	
 	/**
 	 * 鏌ヨ鐢ㄦ埛涓被鍨嬮璁″閲�
@@ -168,7 +176,8 @@
 	BigDecimal getRewardMoneyByDate(@Param("uid") Long uid, @Param("day")Integer dateType, 
 			@Param("type") Integer hbType, @Param("orderState") Integer orderState,
 			@Param("orderNo") String orderNo, @Param("moneyState") Integer moneyState,  
-			@Param("startTime") String startTime, @Param("endTime") String endTime,@Param("listSource") List<Integer> listSource);
+			@Param("startTime") String startTime, @Param("endTime") String endTime,
+			@Param("listSource") List<Integer> listSource);
 
 	/**
 	 * 缁熻鍚勪釜璁㈠崟绫诲瀷 鏈夋晥涓暟
@@ -179,4 +188,30 @@
 	Long countOrderByTypeAndDate(@Param("orderType") Integer orderType, @Param("preDay") String preDay);
 	
 	
+	/**
+	 * 缁熻杩戞棩鍒拌处鏀跺叆閲戦
+	 * @param uid
+	 * @param day
+	 * @return
+	 */
+	BigDecimal sumMoneyArrivalByUidAndNearDay(@Param("uid") Long uid, @Param("day") int day);
+	
+	
+	/**
+	 * 缁熻缁撶畻閲戦
+	 * @param uid
+	 * @param minDate
+	 * @param maxDate
+	 * @return
+	 */
+	BigDecimal sumMoneyBySettleTimeAndUid(@Param("uid") Long uid, @Param("minDate") Date minDate, @Param("maxDate") Date maxDate);
+
+	/**
+	 * 180鍐呮湭鏀惰揣鐨勯噾棰�
+	 * @param uid
+	 * @return
+	 */
+	BigDecimal sumMoneyByANotSettleAndUid(@Param("uid") Long uid);
+	
+	
 }
\ No newline at end of file

--
Gitblit v1.8.0