From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareGoodsService.java |   61 ++++++++++++++++++++++++++++--
 1 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareGoodsService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareGoodsService.java
index ef94f47..58fc560 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareGoodsService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareGoodsService.java
@@ -45,16 +45,37 @@
 	public UserShareGoodsHistory getShareGoodsHistoryDetail(Long uid, Long auctionId) throws ShareGoodsException;
 
 	/**
+	 * 鑾峰彇鍒嗕韩璁板綍
+	 * 
+	 * @param uid
+	 * @param auctionId
+	 * @return
+	 */
+	public UserShareGoodsHistory getShareGoodsHistory(Long uid, Long auctionId);
+
+	/**
 	 * 鑾峰彇鍟嗗搧鐨勫垎浜浆閾鹃摼鎺�
 	 * 
 	 * @param uid
 	 * @param auctionId
-	 * @param relationId -娓犻亾ID
+	 * @param relationId
+	 *            -娓犻亾ID
 	 * @return
 	 * @throws ShareGoodsException
 	 */
 
-	public TaoBaoLink getTaoBaoLinkForShare(Long uid, Long auctionId,String relationId) throws ShareGoodsException;
+	public TaoBaoLink getTaoBaoLinkForShare(Long uid, Long auctionId, String relationId) throws ShareGoodsException;
+	
+	/**
+	 * 鑾峰彇鍟嗗搧鐨勫垎浜浆閾鹃摼鎺�
+	 * @param uid
+	 * @param auctionId
+	 * @param relationId
+	 * @param pid
+	 * @return
+	 * @throws ShareGoodsException
+	 */
+	public TaoBaoLink getTaoBaoLinkForShare(Long uid, Long auctionId, String relationId,String pid) throws ShareGoodsException;
 
 	/**
 	 * 鑾峰彇鍟嗗搧鐨勮喘涔拌浆閾鹃摼鎺�
@@ -77,15 +98,47 @@
 	 */
 	public TaoBaoLink getTaoBaoLinkForBuyWithSpecial(Long uid, String specialId, Long auctionId)
 			throws ShareGoodsException;
-	
+
 	/**
 	 * 閫氳繃PID璁剧疆閾炬帴
+	 * 
 	 * @param uid
 	 * @param auctionId
 	 * @param pid
 	 * @return
 	 * @throws ShareGoodsException
 	 */
-	public TaoBaoLink getTaoBaoLink(Long uid, Long auctionId, String pid) throws ShareGoodsException ;
+	public TaoBaoLink getTaoBaoLink(Long uid, Long auctionId, String pid) throws ShareGoodsException;
+
+	/**
+	 * 娣樼ぜ閲戦鍙栭摼鎺�
+	 * @param uid
+	 * @param specialId
+	 * @param auctionId
+	 * @return
+	 * @throws ShareGoodsException
+	 */
+	public TaoBaoLink getTaoLiJinLinkForBuy(Long uid, String specialId, Long auctionId,String pid) throws ShareGoodsException;
+
+	/**
+	 * 娣樼ぜ閲� 閾炬帴
+	 * @param uid
+	 * @param auctionId
+	 * @param relationId
+	 * @return
+	 * @throws ShareGoodsException
+	 */
+	public TaoBaoLink getTaoLiJinLinkForShare(Long uid, Long auctionId, String relationId) throws ShareGoodsException;
+	
+	
+	
+	/**
+	 * 
+	 * @param uid
+	 * @param auctionId
+	 * @return
+	 * @throws ShareGoodsException
+	 */
+	public TaoBaoLink getTaoLiJinLinkForBuyWithOutFanLi(Long uid,  Long auctionId) throws ShareGoodsException;
 
 }

--
Gitblit v1.8.0