From 01e773cf27e572b8fb83538d85f31130930d93d1 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 15 八月 2019 15:57:23 +0800
Subject: [PATCH] 券赠送

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
index e4aaea8..1defb88 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -1167,6 +1167,8 @@
 								|| CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {
 							if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {
 								// 鍏嶅崟鎴愬姛
+								order.setOtherState(2);
+							} else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) {
 								order.setOtherState(1);
 							}
 						}
@@ -1182,6 +1184,8 @@
 								|| CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {
 							if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {
 								// 鍏嶅崟鎴愬姛
+								order.setOtherState(2);
+							} else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) {
 								order.setOtherState(1);
 							}
 						}
@@ -1197,6 +1201,8 @@
 								|| CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {
 							if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {
 								// 鍏嶅崟鎴愬姛
+								order.setOtherState(2);
+							} else if (UserSystemCouponRecord.STATE_FREE_ON == couponState) {
 								order.setOtherState(1);
 							}
 						}

--
Gitblit v1.8.0