From b2901a0793cfe3a1eb04318c1f8786c988e83108 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 16 八月 2019 14:28:14 +0800
Subject: [PATCH] 的
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
index 70fc695..d3a8fd7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
@@ -198,8 +198,8 @@
}
SystemCoupon coupon = null;
- if (couponType.equals(CouponTypeEnum.welfareFreeCoupon.name())) {
- // 绂忓埄鍏嶅崟鍒�
+ if (couponType.equals(CouponTypeEnum.welfareFreeCoupon.name()) || couponType.equals(CouponTypeEnum.freeCoupon.name())) {
+ // 鍏嶅崟鍒�
coupon = systemCouponService.getCouponByType(couponType);
} else if (couponType.equals(CouponTypeEnum.rebatePercentCoupon.name())) {
// 闅忔満濂栧姳鍒�
@@ -219,6 +219,8 @@
if (countSuccess == 0) {
stateActivated = 0;
}
+ } else if (coupon.getType() == CouponTypeEnum.freeCoupon) {
+ stateActivated = 0;
}
// 缁撴潫鏃ユ湡
--
Gitblit v1.8.0