From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:28:03 +0800
Subject: [PATCH] Merge branch 'div_12'
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java
index 3248a0a..eee49ba 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java
@@ -88,7 +88,19 @@
* @param maxDate
* @return
*/
- BigDecimal getUnRecievedMoneyWithCreateTime(@Param("uid")Long uid, @Param("minDate") Date minDate, @Param("maxDate") Date maxDate);
+ BigDecimal getUnRecievedMoneyWithCreateTime(@Param("uid") Long uid, @Param("minDate") Date minDate,
+ @Param("maxDate") Date maxDate);
+
+ /**
+ * 鏍规嵁棰勮棰嗗彇鏃堕棿涓庣敤鎴稩D鑾峰彇鏈埌璐︾殑閲戦
+ *
+ * @param uid
+ * @param minDate
+ * @param maxDate
+ * @return
+ */
+ BigDecimal getUnRecievedMoneyWithPreGetTime(@Param("uid") Long uid, @Param("minDate") Date minDate,
+ @Param("maxDate") Date maxDate);
/**
* 鏍规嵁绾㈠寘绫诲瀷鑾峰彇缁撶畻鍒楄〃
@@ -129,4 +141,22 @@
Long countInviteOrderCountByUidAndSettleTime(@Param("uid") Long uid, @Param("state") int state,
@Param("minDate") Date minDate, @Param("maxDate") Date maxDate);
+ /**
+ * 閫氳繃鐢ㄦ埛ID鍜岀姸鎬佹煡璇㈡暟閲�
+ *
+ * @param uid
+ * @param state
+ * @return
+ */
+ Long countByUidAndState(@Param("uid") Long uid, @Param("state") int state);
+
+ /**
+ * 閫氳繃鐢ㄦ埛ID涓庣姸鎬佽绠楄祫閲�
+ *
+ * @param uid
+ * @param stateList
+ * @return
+ */
+ BigDecimal computeMoneyByUidAndState(@Param("uid") Long uid,@Param("stateList") List<Integer> stateList);
+
}
\ No newline at end of file
--
Gitblit v1.8.0