From d1bcc87e41d8d176ce58ee9e27a17ec93d0d7cb2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 23 八月 2019 11:59:18 +0800
Subject: [PATCH] Merge branch 'mater-1.6.0' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponRecordService.java |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 insertions(+), 2 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 783dc95..0e46d2b 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
@@ -16,14 +16,40 @@
 
 	public UserSystemCouponRecord getRecordByOrderNo(String orderNo, Integer state);
 
-	public List<UserSystemCouponRecord> getRecordByOrderNoList(List<String> list);
+	public List<UserSystemCouponRecord> getRecordByOrderNoList(Integer source, List<String> list);
 
 	/**
 	 * 鏌ヨ姝ｅ湪浣跨敤涓� 瓒呰繃鏃堕棿浠嶆湭鍖归厤鍒拌鍗曡褰�
+	 * 
 	 * @param uid
 	 * @param seconds
 	 * @return
 	 */
-	public List<UserSystemCouponRecord> getCouponByUsingTimeOut(Long uid, long seconds);
+	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(Integer source, String orderId);
+
 	
+	/**
+	 * 鏌ヨ鏈�杩戣褰�
+	 * @param userCouponId
+	 * @return
+	 */
+	public UserSystemCouponRecord getNearByUserCouponId(Long userCouponId);
+
 }

--
Gitblit v1.8.0