From d1bcc87e41d8d176ce58ee9e27a17ec93d0d7cb2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 23 八月 2019 11:59:18 +0800
Subject: [PATCH] Merge branch 'mater-1.6.0' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralExchangeService.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralExchangeService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralExchangeService.java
index 5c705be..60f867d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralExchangeService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/integral/IntegralExchangeService.java
@@ -26,14 +26,34 @@
 	 * @throws IntegralExchangeException
 	 */
 	public ExchangeTipVO verifyExchange(Long uid, Long id) throws IntegralExchangeException;
+	
+	
+	/**
+	 * 楠岃瘉鍐呴儴椤甸潰
+	 * @param uid
+	 * @param id
+	 * @return
+	 * @throws IntegralExchangeException
+	 */
+	public ExchangeTipVO verifyInviteCode(Long uid, Long id) throws IntegralExchangeException;
 
 	/**
 	 * 閲戝竵鍏戞崲
 	 * @param uid
 	 * @param id
-	 * @param inviteId
 	 * @throws IntegralExchangeException
 	 */
-	public void exchange(Long uid, Long id, Long inviteId) throws IntegralExchangeException;
+	public IntegralExchange exchange(Long uid, Long id) throws IntegralExchangeException;
+
+	
+	/**
+	 * 閭�璇风爜鍏戞崲
+	 * @param uid
+	 * @param id
+	 * @return
+	 * @throws IntegralExchangeException
+	 */
+	public void exchangeInviteCode(Long uid, Long id) throws IntegralExchangeException;
+
 	
 }

--
Gitblit v1.8.0