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/integral/IntegralTaskRecordMapper.java | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/integral/IntegralTaskRecordMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/integral/IntegralTaskRecordMapper.java
index 2301f61..9919bf0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/integral/IntegralTaskRecordMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/integral/IntegralTaskRecordMapper.java
@@ -4,8 +4,6 @@
import java.util.List;
import java.util.Set;
-import javax.annotation.Nullable;
-
import org.apache.ibatis.annotations.Param;
import com.yeshi.fanli.dao.BaseMapper;
@@ -61,6 +59,18 @@
* @return
*/
List<IntegralTaskRecord> listDaySignRecord(@Param("uid") Long uid, @Param("cid") Long cid);
+
+
+ /**
+ * 杩炵画绛惧埌鎯呭喌
+ *
+ * @param uid
+ * @param cid
+ * @param sortState
+ * 1鍊掑簭-鍒涘缓鏃堕棿
+ * @return
+ */
+ List<IntegralTaskRecord> listDateSignRecord(@Param("uid") Long uid, @Param("cid") Long cid);
/**
* 杩�7澶╃鍒版儏鍐�
@@ -108,7 +118,8 @@
* @param uid
* @return
*/
- int countByTaskIdTodayNum(@Param("uid") Long uid, @Param("tid") Long tid, @Param("date") String date);
+ int countByTaskIdTodayNum(@Param("uid") Long uid, @Param("tid") Long tid, @Param("date") String date,
+ @Param("recordId") Long recordId);
/**
* 鏍规嵁绫诲瀷涓庡垱寤烘椂闂存绱�
@@ -120,9 +131,27 @@
* @param count
* @return
*/
- List<IntegralTaskRecord> listByCidAndUidAndCreateTime(@Param("cid") Long cid,@Param("uid") Long uid, @Param("minTime") Date minTime,
- @Param("maxTime") Date maxTime, @Param("start") long start, @Param("count") int count);
+ List<IntegralTaskRecord> listByCidAndUidAndCreateTime(@Param("cid") Long cid, @Param("uid") Long uid,
+ @Param("minTime") Date minTime, @Param("maxTime") Date maxTime, @Param("start") long start,
+ @Param("count") int count);
- long countByCidAndUidAndCreateTime(@Param("cid") Long cid,@Param("uid") Long uid, @Param("minTime") Date minTime,
+ long countByCidAndUidAndCreateTime(@Param("cid") Long cid, @Param("uid") Long uid, @Param("minTime") Date minTime,
@Param("maxTime") Date maxTime);
+
+ /**
+ * 鏍规嵁鐢ㄦ埛ID涓庝换鍔D鏌ヨ
+ *
+ * @param uid
+ * @param taskId
+ * @param start
+ * @param count
+ * @return
+ */
+ List<IntegralTaskRecord> listByUidAndTaskId(@Param("uid") Long uid, @Param("taskId") Long taskId,
+ @Param("start") long start, @Param("count") int count);
+
+ /**
+ * 鏇存柊閲戝竵澶辨晥
+ */
+ void invalidGoldCoin();
}
--
Gitblit v1.8.0