From c3b33f84b6ce927b4be681a4f1e4080706d390a9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 29 八月 2019 18:17:52 +0800
Subject: [PATCH] 维权订单修改
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserSystemCouponMapper.java | 48 +++++++++++++++++++++++++++++++-----------------
1 files changed, 31 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..3c733d8 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);
@@ -52,6 +59,13 @@
List<UserSystemCoupon> getCounponNowInvalid(@Param("count")int count);
/**
+ * 鑾峰彇宸茬粡杩囨湡浣嗙姸鎬佹湭鏀瑰彉鐨勫埜
+ * @param uid
+ * @return
+ */
+ List<UserSystemCoupon> getCounponNowInvalidByUid(@Param("uid")Long uid);
+
+ /**
* 鏍规嵁鐘舵�佹煡璇㈠埜
* @param uid
* @param source
@@ -65,21 +79,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