From d88c167fc5973a2c15ff1539e4cdab36e4a7842c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 28 八月 2019 14:47:15 +0800
Subject: [PATCH] 奖励券使用区分订单下单三方日期
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponMapper.java | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 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..a0ebf86 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
@@ -14,6 +14,13 @@
List<UserSystemCoupon> getUserCouponList(@Param("start") long start, @Param("count") int count,
@Param("uid") Long uid);
+
+ List<UserSystemCouponVO> getCouponListOld(@Param("start") long start, @Param("count") int count,
+ @Param("uid") Long uid);
+
+ long countCouponOld(@Param("uid") Long uid);
+
+
List<UserSystemCouponVO> getUserCouponVOList(@Param("start") long start, @Param("count") int count,
@Param("uid") Long uid);
@@ -65,21 +72,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("num") int num, @Param("type") String type);
+
+
+ /**
+ * 鏌ヨ鎺掑嚭鍏戞崲鐨勫埜
+ * @param uid
+ * @param source
+ * @return
+ */
+ List<UserSystemCouponVO> getIncludeNotExchange(@Param("uid") Long uid,@Param("num") int num, @Param("type") String type);
+
}
\ No newline at end of file
--
Gitblit v1.8.0