From 0b0a5ccd1f42342a3ec7e2e2bbe74bfad4fe066e Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 16:59:36 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponMapper.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 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 8fdb9fd..de5369c 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
@@ -65,21 +65,21 @@
*/
List<UserSystemCoupon> getCouponByTypeAndNotActivated(@Param("uid") Long uid, @Param("couponId") Long couponId);
-// /**
-// * 鏌ヨ鍏戞崲鐨勫埜
-// * @param uid
-// * @param source
-// * @return
-// */
-// List<UserSystemCoupon> countIncludeExchange(@Param("uid") Long uid, @Param("source") String source);
-//
-//
-// /**
-// * 鏌ヨ鎺掑嚭鍏戞崲鐨勫埜
-// * @param uid
-// * @param source
-// * @return
-// */
-// List<UserSystemCoupon> countNotIncludeExchange(@Param("uid") Long uid, @Param("source") String source);
-//
+ /**
+ * 鏌ヨ鍏戞崲鐨勫埜
+ * @param uid
+ * @param source
+ * @return
+ */
+ List<UserSystemCoupon> getIncludeExchange(@Param("uid") Long uid, @Param("list") List<String> list);
+
+
+ /**
+ * 鏌ヨ鎺掑嚭鍏戞崲鐨勫埜
+ * @param uid
+ * @param source
+ * @return
+ */
+ List<UserSystemCoupon> getIncludeNotExchange(@Param("uid") Long uid,@Param("list") List<String> list);
+
}
\ No newline at end of file
--
Gitblit v1.8.0