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/impl/user/UserSystemCouponRecordServiceImpl.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 7c51f69..376059e 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
@@ -49,23 +49,19 @@
}
@Override
- public List<UserSystemCouponRecord> getRecordByOrderNoList(List<String> list) {
- return userSystemCouponRecordMapper.getRecordByOrderNoList(list);
+ 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
- public boolean isSuccessMianDan(String orderId) {
+ public boolean isSuccessMianDan(Integer source, String orderId) {
List<String> orderList = new ArrayList<>();
orderList.add(orderId);
- List<UserSystemCouponRecord> list = getRecordByOrderNoList(orderList);
+ 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;
@@ -74,4 +70,8 @@
return false;
}
+ @Override
+ public UserSystemCouponRecord getNearByUserCouponId(Long userCouponId) {
+ return userSystemCouponRecordMapper.getNearByUserCouponId(userCouponId);
+ }
}
--
Gitblit v1.8.0