From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/TokenRecordService.java |   41 +++++++++++++++++++++++++++++++++++++++--
 1 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/TokenRecordService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/TokenRecordService.java
index 4d27dd5..85bb32e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/TokenRecordService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/TokenRecordService.java
@@ -1,5 +1,8 @@
 package com.yeshi.fanli.service.inter.user;
 
+import java.util.List;
+
+import com.yeshi.fanli.entity.accept.AcceptData;
 import com.yeshi.fanli.entity.bus.user.TokenRecord;
 import com.yeshi.fanli.exception.user.TokenRecordException;
 import com.yeshi.fanli.vo.msg.TokenVO;
@@ -23,7 +26,7 @@
 	 * @return
 	 * @throws TokenRecordException
 	 */
-	public TokenVO discernToken(String token, Long uid) throws TokenRecordException;
+	public TokenVO discernToken(String token, Long uid, String platform,String version) throws TokenRecordException;
 
 	
 	/**
@@ -32,9 +35,43 @@
 	 * @param uid
 	 * @throws TokenRecordException
 	 */
-	public String receiveToken(String token, Long uid) throws TokenRecordException;
+	public String receiveToken(String token, Long uid, AcceptData acceptData) throws TokenRecordException;
 
 	
 	public void updateByPrimaryKeySelective(TokenRecord record);
 
+	/**
+	 * 寰呰繃鏈熺殑鍙ｄ护
+	 * @param count
+	 * @return
+	 */
+	public List<TokenRecord> overdueList(int count);
+
+	/**
+	 * 杩囨湡鍙ｄ护
+	 * @param list
+	 */
+	public void overdue(List<TokenRecord> list);
+
+	/**
+	 * 绾㈠寘鍙ｄ护澶辨晥
+	 * @param id
+	 */
+	public void invalidByRedPack(Long id);
+
+
+	/**
+	 * 鍒稿彛浠ゅけ鏁�
+	 * @param id
+	 */
+	public void invalidByCoupon(Long id);
+
+	/**
+	 * 鏍规嵁绫诲瀷鏌ヨ
+	 * @param type
+	 * @param identify
+	 * @return
+	 */
+	public TokenRecord getByTypeAndIdentify(String type, String identify);
+
 }

--
Gitblit v1.8.0