From 9d401723afe4fd680f60f97b8d927efea6344a6f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 二月 2019 14:54:22 +0800
Subject: [PATCH] Merge branch 'div'
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponMapper.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponMapper.java
index 3ac54ed..f5edd8d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponMapper.java
@@ -10,6 +10,7 @@
public interface UserSystemCouponMapper extends BaseMapper<UserSystemCoupon> {
+
List<UserSystemCoupon> getUserCouponList(@Param("start") long start, @Param("count") int count,
@Param("uid") Long uid);
@@ -50,5 +51,10 @@
*/
List<UserSystemCoupon> getCouponByState(@Param("uid") Long uid, @Param("state") String state);
+ /**
+ * 鏌ヨ娌℃湁婵�娲荤殑鍒�
+ * @param couponId
+ */
+ List<UserSystemCoupon> getCouponByTypeAndNotActivated(@Param("uid") Long uid, @Param("couponId") Long couponId);
}
\ No newline at end of file
--
Gitblit v1.8.0