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/UserShareGoodsRecordService.java |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsRecordService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsRecordService.java
index 73b1aa9..6bce305 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsRecordService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsRecordService.java
@@ -3,7 +3,10 @@
 import java.util.List;
 
 import com.yeshi.fanli.dto.share.ShareGoodsRecordDTO;
+import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.entity.bus.share.UserShareGoodsGroup;
 import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord;
+import com.yeshi.fanli.entity.goods.CommonGoods;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
 
@@ -76,7 +79,7 @@
 	 * @param shareId
 	 * @throws UserShareGoodsRecordException
 	 */
-	public void takeEffectShareRecord(String shareKey) throws UserShareGoodsRecordException;
+	public void takeEffectShareRecord(AcceptData acceptData, String shareKey) throws UserShareGoodsRecordException;
 
 
 	/**
@@ -95,7 +98,7 @@
 	 * @param type
 	 * @throws UserShareGoodsRecordException
 	 */
-	public void saveSingleShareRecord(Long uid, Long auctionId) throws UserShareGoodsRecordException;
+	public void saveSingleShareRecord(Long uid, Long auctionId, Integer goodsType) throws UserShareGoodsRecordException;
 
 	
 	/**
@@ -105,7 +108,7 @@
 	 * @return
 	 * @throws UserShareGoodsRecordException
 	 */
-	public ShareGoodsRecordDTO addRecordGoodsDetail(Long uid, Long auctionId) throws UserShareGoodsRecordException;
+	public ShareGoodsRecordDTO addRecordGoodsDetail(Long uid, Long auctionId, Integer goodsType, boolean isTaolijin) throws UserShareGoodsRecordException;
 
 	/**
 	 * 閫夊搧搴撳晢鍝佸垎浜�
@@ -114,7 +117,7 @@
 	 * @return
 	 * @throws UserShareGoodsRecordException
 	 */
-	public ShareGoodsRecordDTO addRecordGoodsStorage(Long uid,List<TaoBaoGoodsBrief> listGoodsBrief) throws UserShareGoodsRecordException;
+	public ShareGoodsRecordDTO addRecordGoodsStorage(Long uid,List<TaoBaoGoodsBrief> listGoodsBrief, List<Long> listStorageID) throws UserShareGoodsRecordException;
 
 	/**
 	 * 鑰佺増鍔ㄦ�佸垎浜�
@@ -139,5 +142,18 @@
 	 */
 	public ShareGoodsRecordDTO addRecordDynamic(Long uid, List<TaoBaoGoodsBrief> listGoodsBrief)
 			throws UserShareGoodsRecordException;
+
+	public List<UserShareGoodsGroup> listByRecordId(Long shareId);
+
+	public ShareGoodsRecordDTO addRecordGoodsStorageV2(Long uid, List<CommonGoods> listCommonGoods,
+			List<Long> listStorageID,boolean needDrawPicture) throws UserShareGoodsRecordException;
+
+	/**
+	 * 鍒涘缓鍒嗕韩璁板綍
+	 * @param uid
+	 * @param goods
+	 * @throws UserShareGoodsRecordException
+	 */
+	public void saveShareRecord(Long uid, CommonGoods goods) throws UserShareGoodsRecordException;
 	
 }

--
Gitblit v1.8.0