From 88c7df1d5089d8e39f356a68eaccc18f308e190c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 12:10:07 +0800
Subject: [PATCH] Merge branch 'div' into div-1
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2CountMapper.java | 16 ++++++++++++++--
1 files changed, 14 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 e8552bb..adccd27 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,20 @@
* @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);
+
+
+
+ /**
+ * 娉細1绗斾笖浠樻鎬婚噾棰濅笉灏忎簬 payment 鍏冿紙閫�娆句负澶辨晥
+ * @param uid
+ * @param list 绫诲瀷
+ * @return
+ */
+ Long counOrderByUidAndOrderType(@Param("uid") Long uid, @Param("payment") BigDecimal payment,
+ @Param("type") int type);
+
/**
@@ -229,7 +241,7 @@
* @param preDay
* @return
*/
- Integer countOrderByTypeAndDate(@Param("orderType") Integer orderType, @Param("preDay") String preDay);
+ Long countOrderByTypeAndDate(@Param("orderType") Integer orderType, @Param("preDay") String preDay);
}
\ No newline at end of file
--
Gitblit v1.8.0