From a4e938874dbc0376125324cb170f5885f88da8a7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 11 十一月 2019 16:45:51 +0800
Subject: [PATCH] 板栗商城退款修改，获取用户的会员运营ID与渠道ID修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponRecordServiceImpl.java | 8 ++------
1 files changed, 2 insertions(+), 6 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..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
@@ -54,18 +54,14 @@
}
@Override
- public List<UserSystemCouponRecord> getCouponByUsingTimeOut(Long uid, Long seconds) {
- return userSystemCouponRecordMapper.getCouponByUsingTimeOut(uid, seconds);
- }
-
- @Override
public boolean isSuccessMianDan(Integer source, String orderId) {
List<String> orderList = new ArrayList<>();
orderList.add(orderId);
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