From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期六, 23 五月 2020 09:54:38 +0800 Subject: [PATCH] 足迹、收藏订单兼容新需求 --- fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponRecordServiceImpl.java | 12 ++++++------ 1 files changed, 6 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 cdd42bc..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; @@ -74,4 +70,8 @@ return false; } + @Override + public UserSystemCouponRecord getNearByUserCouponId(Long userCouponId) { + return userSystemCouponRecordMapper.getNearByUserCouponId(userCouponId); + } } -- Gitblit v1.8.0