From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserSystemCouponRecordService.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 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 9b732b8..4548621 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,16 +16,8 @@
 
 	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);
 
 	/**
 	 * 鏌ヨ鐘舵��
@@ -42,6 +34,14 @@
 	 * @param orderId
 	 * @return
 	 */
-	public boolean isSuccessMianDan(String orderId);
+	public boolean isSuccessMianDan(Integer source, String orderId);
+
+	
+	/**
+	 * 鏌ヨ鏈�杩戣褰�
+	 * @param userCouponId
+	 * @return
+	 */
+	public UserSystemCouponRecord getNearByUserCouponId(Long userCouponId);
 
 }

--
Gitblit v1.8.0