From 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 29 四月 2019 08:59:47 +0800
Subject: [PATCH] Merge branch 'div_develop' into master_develop

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/goods/ShareGoodsService.java |   49 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 47 insertions(+), 2 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 d63fe70..30252d2 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,15 +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
+	 * @return
 	 * @throws ShareGoodsException
 	 */
 
-	public TaoBaoLink getTaoBaoLinkForShare(Long uid, Long auctionId) 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;
 
 	/**
 	 * 鑾峰彇鍟嗗搧鐨勮喘涔拌浆閾鹃摼鎺�
@@ -65,4 +87,27 @@
 	 */
 	public TaoBaoLink getTaoBaoLinkForBuy(Long uid, Long auctionId, int pidType) throws ShareGoodsException;
 
+	/**
+	 * 鐢ㄤ細鍛樿繍钀D鑾峰彇鍟嗗搧鐨勫垎浜浆閾鹃摼鎺�
+	 * 
+	 * @param uid
+	 * @param auctionId
+	 * @param pidType
+	 * @return
+	 * @throws ShareGoodsException
+	 */
+	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;
+
 }

--
Gitblit v1.8.0