From e5e38de6745c8fcae91fa7e459898f3663d00001 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 19 八月 2019 17:41:32 +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