From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 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..6b0ac36 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,28 +133,14 @@
*/
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);
@@ -179,4 +165,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