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/impl/user/UserSystemCouponRecordServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 971ef8c..360e392 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,8 +49,8 @@
}
@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
@@ -59,10 +59,10 @@
}
@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())) {
@@ -74,4 +74,8 @@
return false;
}
+ @Override
+ public UserSystemCouponRecord getNearByUserCouponId(Long userCouponId) {
+ return userSystemCouponRecordMapper.getNearByUserCouponId(userCouponId);
+ }
}
--
Gitblit v1.8.0