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 |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 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 6b0ac36..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
@@ -140,9 +140,31 @@
 	 * @param payment
 	 * @return
 	 */
-	Long countMyDirectOrderByCashArrival(@Param("uid") Long uid, @Param("payment") BigDecimal payment);
+	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);
 	
 	/**
 	 * 鏌ヨ鐢ㄦ埛涓被鍨嬮璁″閲�
@@ -154,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);
 
 	/**
 	 * 缁熻鍚勪釜璁㈠崟绫诲瀷 鏈夋晥涓暟

--
Gitblit v1.8.0