From 0a3b073eb7e6a1c77b73e1d44fe53f040e560ab3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 二月 2019 15:44:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponRecordService.java |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponRecordService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponRecordService.java
index f9a0354..9b732b8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponRecordService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponRecordService.java
@@ -17,5 +17,31 @@
 	public UserSystemCouponRecord getRecordByOrderNo(String orderNo, Integer state);
 
 	public List<UserSystemCouponRecord> getRecordByOrderNoList(List<String> list);
-	
+
+	/**
+	 * 鏌ヨ姝ｅ湪浣跨敤涓� 瓒呰繃鏃堕棿浠嶆湭鍖归厤鍒拌鍗曡褰�
+	 * 
+	 * @param uid
+	 * @param seconds
+	 * @return
+	 */
+	public List<UserSystemCouponRecord> getCouponByUsingTimeOut(Long uid, long seconds);
+
+	/**
+	 * 鏌ヨ鐘舵��
+	 * 
+	 * @param uid
+	 * @param state
+	 * @return
+	 */
+	public List<UserSystemCouponRecord> getRecordByState(Long uid, Integer state);
+
+	/**
+	 * 璁㈠崟鍙锋槸鍚︽垚鍔熷厤鍗�
+	 * 
+	 * @param orderId
+	 * @return
+	 */
+	public boolean isSuccessMianDan(String orderId);
+
 }

--
Gitblit v1.8.0