From 09476adf2ae2bcc2f6685dafe4707938fd82bc78 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 25 七月 2019 12:19:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsRecordService.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 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 a491090..6fc6082 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,6 +3,7 @@
 import java.util.List;
 
 import com.yeshi.fanli.dto.share.ShareGoodsRecordDTO;
+import com.yeshi.fanli.entity.bus.share.UserShareGoodsGroup;
 import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
@@ -139,5 +140,10 @@
 	 */
 	public ShareGoodsRecordDTO addRecordDynamic(Long uid, List<TaoBaoGoodsBrief> listGoodsBrief)
 			throws UserShareGoodsRecordException;
+
+	public List<UserShareGoodsGroup> listByRecordId(Long shareId);
+
+	public ShareGoodsRecordDTO addRecordGoodsStorageV2(Long uid, List<TaoBaoGoodsBrief> listGoodsBrief,
+			List<Long> listStorageID) throws UserShareGoodsRecordException;
 	
 }

--
Gitblit v1.8.0