From 486e22c57ca8a1e2dc6877b539e2f3add67250f1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:28:00 +0800
Subject: [PATCH] 冲突解决

---
 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 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 77670d5..4d84adf 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
@@ -169,5 +169,23 @@
 	 * @return
 	 */
 	long countShareOrInviteOrder(@Param("uid") Long uid);
+	
+	/**
+	 * 缁熻涓嬬骇浜х敓鏈夋晥鍒嗕韩濂栭噾
+	 * @param uid
+	 * @param teamUid 涓嬬骇id
+	 * @param endTime 缁撴潫鏃堕棿
+	 * @return
+	 */
+	BigDecimal getShareRewardByTeamUid(@Param("uid") Long uid, @Param("teamUid") Long teamUid, @Param("endTime") Date endTime);
+
+	/**
+	 * 缁熻涓嬬骇涓婁釜鏈夋晥璁㈠崟
+	 * @param uid
+	 * @param teamUid 涓嬬骇id
+	 * @param endTime 缁撴潫鏃堕棿
+	 * @return
+	 */
+	BigDecimal getShareRewardByTeamUidLastMonth(@Param("uid") Long uid, @Param("teamUid") Long teamUid);
 
 }
\ No newline at end of file

--
Gitblit v1.8.0