From 486e22c57ca8a1e2dc6877b539e2f3add67250f1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:28:00 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/redpack/RedPackWinInviteMapper.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/redpack/RedPackWinInviteMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/redpack/RedPackWinInviteMapper.java
index caea106..3a0500a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/redpack/RedPackWinInviteMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/redpack/RedPackWinInviteMapper.java
@@ -25,10 +25,26 @@
* @param type
* @return
*/
- long countByUidAndTeamUidAndType(@Param("uid")Long uid,@Param("teamUid")Long teamUid, @Param("type")String type);
+ int countByUidAndTeamUidAndType(@Param("uid")Long uid,@Param("teamUid")Long teamUid, @Param("type")String type);
+
+ /**
+ * 缁熻鐢ㄦ埛銆佷笅绾с�佺被鍨嬬殑鏁伴噺
+ * @param uid
+ * @param type
+ * @return
+ */
+ RedPackWinInvite getByUidAndTeamUidAndType(@Param("uid")Long uid,@Param("teamUid")Long teamUid, @Param("type")String type);
/**
+ * 缁熻鐢ㄦ埛銆佷笅绾с�佺被鍨嬬殑鏁伴噺
+ * @param uid
+ * @param type
+ * @return
+ */
+ RedPackWinInvite getByUidAndTeamUidAndTypeMonth(@Param("uid")Long uid,@Param("teamUid")Long teamUid, @Param("type")String type);
+
+ /**
* 鏌ヨ鐢ㄦ埛璁板綍
* @param start
* @param count
--
Gitblit v1.8.0