From b72be3656e4a381a60ada768a58fa8523719b10d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 29 八月 2019 19:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/integral/IntegralDetailMapper.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/integral/IntegralDetailMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/integral/IntegralDetailMapper.java
index e50a6e5..4ef648a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/integral/IntegralDetailMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/integral/IntegralDetailMapper.java
@@ -17,7 +17,7 @@
* @param uid
* @return
*/
- Long selectCountByUid(@Param("uid") Long uid);
+ Long selectCountByUid(@Param("uid") Long uid, @Param("type")Integer type);
/**
* 鎸夌敤鎴稩D鍜屾渶澶ф椂闂存绱㈡湀浠界殑鏁伴噺
@@ -26,7 +26,7 @@
* @param maxDate
* @return
*/
- int selectMonthCountByUid(@Param("uid") Long uid, @Param("date") Date maxDate);
+ int selectMonthCountByUid(@Param("uid") Long uid, @Param("date") Date maxDate, @Param("type")Integer type);
/**
@@ -36,7 +36,7 @@
* @param date
* @return
*/
- Long selectCountByUidAndMaxCreateTime(@Param("uid") Long uid, @Param("date") Date date);
+ Long selectCountByUidAndMaxCreateTime(@Param("uid") Long uid, @Param("date") Date date, @Param("type")Integer type);
/**
@@ -46,7 +46,7 @@
* @param date
* @return
*/
- List<IntegralDetail> selectByMaxCreateTime(@Param("uid") Long uid, @Param("date") Date date, @Param("count") int count);
+ List<IntegralDetail> selectByMaxCreateTime(@Param("uid") Long uid, @Param("date") Date date, @Param("count") int count, @Param("type")Integer type);
/**
@@ -57,7 +57,7 @@
* @param count
* @return
*/
- List<IntegralDetail> selectByUidWithIndexId(@Param("uid") Long uid, @Param("id") Long id, @Param("count") int count);
+ List<IntegralDetail> selectByUidWithIndexId(@Param("uid") Long uid, @Param("id") Long id, @Param("count") int count, @Param("type")Integer type);
/**
--
Gitblit v1.8.0