From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 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 06b5c58..3229046 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
@@ -207,8 +207,23 @@
* @param list 绫诲瀷
* @return
*/
- long countValidOrderTeamUserByUid(@Param("uid") Long uid, @Param("time") Long time,
+ 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 绫诲瀷
+ * @return
+ */
+ Long counOrderByUidAndOrderType(@Param("uid") Long uid, @Param("payment") BigDecimal payment,
+ @Param("type") int type);
+
/**
@@ -221,6 +236,15 @@
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("source") Integer source,
- @Param("startTime") String startTime, @Param("endTime") String endTime);
+ @Param("startTime") String startTime, @Param("endTime") String endTime,@Param("listSource") List<Integer> listSource);
+
+ /**
+ * 缁熻鍚勪釜璁㈠崟绫诲瀷 鏈夋晥涓暟
+ * @param orderType
+ * @param preDay
+ * @return
+ */
+ Long countOrderByTypeAndDate(@Param("orderType") Integer orderType, @Param("preDay") String preDay);
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0