From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponRecordServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 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..8efffc1 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
@@ -65,7 +65,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