From ec6389a5f15c729a0a76577de04b61e602db0663 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 12 十二月 2018 10:31:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsRecordService.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 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 b06668b..a574837 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
@@ -2,6 +2,8 @@
 
 import java.util.List;
 
+import net.sf.json.JSONObject;
+
 import org.yeshi.utils.entity.FileUploadResult;
 
 import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord;
@@ -55,10 +57,11 @@
 	 * 澶氫釜鍟嗗搧鍒嗕韩
 	 * @param uid 鐢ㄦ埛id
 	 * @param source 鏉ユ簮
+	 * @param title 鏍囬鍐呭
 	 * @param listGoods 鍟嗗搧闆嗗悎
 	 * @throws UserShareGoodsRecordException
 	 */
-	public FileUploadResult save(Long uid, ShareSourceTypeEnum source, List<TaoBaoGoodsBrief> listGoods)
+	public FileUploadResult save(Long uid, ShareSourceTypeEnum source, String title, List<TaoBaoGoodsBrief> listGoods)
 			throws UserShareGoodsRecordException;
 
 	/**
@@ -68,7 +71,17 @@
 	 * @param taoBaoGoodsBrief 鍟嗗搧
 	 * @throws UserShareGoodsRecordException
 	 */
-	public void save(Long uid, ShareSourceTypeEnum source, TaoBaoGoodsBrief taoBaoGoodsBrief)
+	public void save(Long uid, ShareSourceTypeEnum source, String title, TaoBaoGoodsBrief taoBaoGoodsBrief)
 			throws UserShareGoodsRecordException;
+	
+	
+	/**
+	 * 鏌ヨ宸插垎浜晢鍝�
+	 * @param recordId
+	 * @return
+	 * @throws UserShareGoodsRecordException
+	 */
+	public JSONObject getGoodsGroup(Long recordId) throws UserShareGoodsRecordException;
+
 
 }

--
Gitblit v1.8.0