From dc5be7d38446f70e6ff86df311119c32b41fe7f8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 28 十一月 2020 16:37:05 +0800
Subject: [PATCH] 大淘客搜索接口升级

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponRecordServiceImpl.java |   12 ++++--------
 1 files changed, 4 insertions(+), 8 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 360e392..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
@@ -65,7 +60,8 @@
 		List<UserSystemCouponRecord> list = getRecordByOrderNoList(source, orderList);
 		for (UserSystemCouponRecord record : list) {
 			if (record.getCouponType().equalsIgnoreCase(CouponTypeEnum.freeCoupon.name())
-					|| record.getCouponType().equalsIgnoreCase(CouponTypeEnum.welfareFreeCoupon.name())) {
+					|| record.getCouponType().equalsIgnoreCase(CouponTypeEnum.welfareFreeCoupon.name())
+					|| record.getCouponType().equalsIgnoreCase(CouponTypeEnum.freeCouponBuy.name())) {
 				if (record.getState() == UserSystemCouponRecord.STATE_FREE_ON
 						|| record.getState() == UserSystemCouponRecord.STATE_SUCCESS)
 					return true;

--
Gitblit v1.8.0