From e40d1c22c7202aac843c66f9ee9cc000744f9e10 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 六月 2020 15:52:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponRecordServiceImpl.java |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponRecordServiceImpl.java
index 8efffc1..f14e214 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponRecordServiceImpl.java
@@ -44,18 +44,13 @@
 	}
 
 	@Override
-	public UserSystemCouponRecord getRecordByOrderNo(String orderNo, Integer state) {
-		return userSystemCouponRecordMapper.getRecordByOrderNo(orderNo, state);
+	public UserSystemCouponRecord getRecordByOrderNo(String orderNo, Integer source, Integer state) {
+		return userSystemCouponRecordMapper.getRecordByOrderNo(orderNo, source, state);
 	}
 
 	@Override
 	public List<UserSystemCouponRecord> getRecordByOrderNoList(Integer source, List<String> list) {
 		return userSystemCouponRecordMapper.getRecordByOrderNoList(source, list);
-	}
-
-	@Override
-	public List<UserSystemCouponRecord> getCouponByUsingTimeOut(Long uid, Long seconds) {
-		return userSystemCouponRecordMapper.getCouponByUsingTimeOut(uid, seconds);
 	}
 
 	@Override

--
Gitblit v1.8.0