From c6116e2b629c94a088b49cddb157a897970fd543 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 04 九月 2019 10:38:19 +0800
Subject: [PATCH] 邀请激活 + 兑换活动校验是否结束

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeServiceImpl.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeServiceImpl.java
index 093e088..ed45539 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeServiceImpl.java
@@ -113,6 +113,11 @@
 		if (exchange == null)
 			throw new IntegralExchangeException(1, "鍏戞崲鏂瑰紡涓嶅瓨鍦�");
 		
+		Integer state = exchange.getState();
+		if (state == null || state != 1)
+			throw new IntegralExchangeException(1, "鍏戞崲娲诲姩鏈紑鍚�");
+		
+		
 		Integer goldCoin = exchange.getGoldCoin();
 		
 		ExchangeTipVO exchangeTip = new ExchangeTipVO();
@@ -190,9 +195,12 @@
 		if (exchange == null)
 			throw new IntegralExchangeException(1, "鍏戞崲鏂瑰紡涓嶅瓨鍦�");
 
-		ExchangeTypeEnum type = exchange.getType();
+		Integer state = exchange.getState();
+		if (state == null || state != 1)
+			throw new IntegralExchangeException(1, "鍏戞崲娲诲姩鏈紑鍚�");
 		
 		long exchangeCount = 0;
+		ExchangeTypeEnum type = exchange.getType();
 		if (ExchangeTypeEnum.freeCouponBuy == type) {
 			exchangeCount = integralExchangeRecordService.countRecordByUid(id, uid, null);
 			if (exchangeCount >= 1) {

--
Gitblit v1.8.0