From 5396bf8f7e14a559f825e275579e0091a9d29e73 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 十一月 2019 16:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java
index c4167fc..9df4f1e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java
@@ -617,9 +617,35 @@
 			return;
 		Date date = new Date();
 		for (TokenRecord tokenRecord: list) {
+			Integer state = tokenRecord.getState();
+			if (state != null && state == 0) 
+				continue;
+			
 			tokenRecord.setState(1);
 			tokenRecord.setUpdateTime(date);
 			tokenRecordMapper.updateByPrimaryKeySelective(tokenRecord);
 		}
 	}
+	
+	
+	@Override
+	public void invalidByRedPack(Long id) {
+		if (id == null)
+			return;
+		
+		List<String> list = new ArrayList<String>();
+		list.add(TokenTypeEnum.redPack.name());
+		tokenRecordMapper.invalidByTypeAndIdentify(list, id.toString());
+	}
+	
+	@Override
+	public void invalidByCoupon(Long id) {
+		if (id == null)
+			return;
+		
+		List<String> list = new ArrayList<String>();
+		list.add(TokenTypeEnum.freeCoupon.name());
+		list.add(TokenTypeEnum.rebatePercentCoupon.name());
+		tokenRecordMapper.invalidByTypeAndIdentify(list, id.toString());
+	}
 }

--
Gitblit v1.8.0