From db88b87df461820152d68d3d55a28f30c2da83e6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 九月 2019 17:54:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/tlj/UserTaoLiJinOriginService.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/tlj/UserTaoLiJinOriginService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/tlj/UserTaoLiJinOriginService.java
index 28cc154..bd79bef 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/tlj/UserTaoLiJinOriginService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/tlj/UserTaoLiJinOriginService.java
@@ -4,6 +4,7 @@
 import java.util.Date;
 import java.util.List;
 
+import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinGiveRecord;
 import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinOrigin;
 import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinReport;
 import com.yeshi.fanli.entity.bus.user.UserRank;
@@ -140,4 +141,21 @@
 	 * @throws UserTaoLiJinOriginException
 	 */
 	public void exchangeMoney(Long uid, BigDecimal money) throws UserTaoLiJinOriginException;
+
+	/**
+	 * 棰嗗彇娣樼ぜ閲�-濂藉弸璧犻��
+	 * @param uid
+	 * @param money
+	 * @return
+	 * @throws UserTaoLiJinOriginException
+	 */
+	public UserTaoLiJinOrigin receiveFriendsGive(Long uid, BigDecimal money) throws UserTaoLiJinOriginException;
+
+	/**
+	 * 绾㈠寘璧犻�侀��鍥�
+	 * @param uid
+	 * @param UserTaoLiJinGiveRecord record
+	 * @throws UserTaoLiJinOriginException
+	 */
+	public void giveSendBack(Long uid, UserTaoLiJinGiveRecord record) throws UserTaoLiJinOriginException;
 }

--
Gitblit v1.8.0