From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:28:03 +0800
Subject: [PATCH] Merge branch 'div_12'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsRecordService.java |   62 +++++++++++++++++++++++-------
 1 files changed, 47 insertions(+), 15 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 7d0d5d4..46b629b 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
@@ -5,6 +5,7 @@
 
 import net.sf.json.JSONObject;
 
+import com.yeshi.fanli.dto.share.ShareInfoDTO;
 import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord;
 import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord.ShareSourceTypeEnum;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -19,29 +20,30 @@
 	public int updateByPrimaryKeySelective(UserShareGoodsRecord record);
 
 	public UserShareGoodsRecord selectByPrimaryKey(Long id);
-	
+
 	/**
 	 * 鏌ヨ鐢ㄦ埛瀵瑰簲鐨勯�夊搧搴�
+	 * 
 	 * @param start
 	 * @param count
 	 * @param uid
 	 * @return
 	 */
 	public List<UserShareGoodsRecord> listQueryByUid(long start, int count, Long uid, String source);
-	
-	public long countQueryByUid(Long uid, String source);
 
+	public long countQueryByUid(Long uid, String source);
 
 	/**
 	 * 缁熻璁板綍
+	 * 
 	 * @param list
 	 * @return
 	 */
 	public List<UserShareGoodsRecord> listCountRecord(List<Long> list);
 
-	
 	/**
 	 * 鑾峰彇鍒嗕韩璁板綍
+	 * 
 	 * @param start
 	 * @param count
 	 * @param uid
@@ -52,28 +54,37 @@
 
 	/**
 	 * 澶氫釜鍟嗗搧鍒嗕韩
-	 * @param uid 鐢ㄦ埛id
-	 * @param source 鏉ユ簮
-	 * @param title 鏍囬鍐呭
-	 * @param listGoods 鍟嗗搧闆嗗悎
+	 * 
+	 * @param uid
+	 *            鐢ㄦ埛id
+	 * @param source
+	 *            鏉ユ簮
+	 * @param title
+	 *            鏍囬鍐呭
+	 * @param listGoods
+	 *            鍟嗗搧闆嗗悎
 	 * @throws UserShareGoodsRecordException
 	 */
-	public Map<String,Object> save(Long uid, ShareSourceTypeEnum source, String title, List<TaoBaoGoodsBrief> listGoods)
-			throws UserShareGoodsRecordException;
+	public Map<String, Object> save(Long uid, ShareSourceTypeEnum source, String title,
+			List<TaoBaoGoodsBrief> listGoods) throws UserShareGoodsRecordException;
 
 	/**
 	 * 鍗曚釜鍟嗗搧鍒嗕韩
-	 * @param uid 鐢ㄦ埛id
-	 * @param source 鏉ユ簮
-	 * @param taoBaoGoodsBrief 鍟嗗搧
+	 * 
+	 * @param uid
+	 *            鐢ㄦ埛id
+	 * @param source
+	 *            鏉ユ簮
+	 * @param taoBaoGoodsBrief
+	 *            鍟嗗搧
 	 * @throws UserShareGoodsRecordException
 	 */
 	public void save(Long uid, ShareSourceTypeEnum source, String title, TaoBaoGoodsBrief taoBaoGoodsBrief)
 			throws UserShareGoodsRecordException;
-	
-	
+
 	/**
 	 * 鏌ヨ宸插垎浜晢鍝�
+	 * 
 	 * @param recordId
 	 * @return
 	 * @throws UserShareGoodsRecordException
@@ -82,6 +93,7 @@
 
 	/**
 	 * h5鍒嗕韩鍟嗗搧鍒楄〃
+	 * 
 	 * @param recordId
 	 * @return
 	 * @throws UserShareGoodsRecordException
@@ -90,6 +102,7 @@
 
 	/**
 	 * 鏇存柊鍒嗕韩璁板綍
+	 * 
 	 * @param shareId
 	 * @throws UserShareGoodsRecordException
 	 */
@@ -104,4 +117,23 @@
 	 */
 	public void saveDetail(Long uid, Long auctionId, String type) throws UserShareGoodsRecordException;
 
+	/**
+	 * 鍒嗕韩璁板綍璁℃暟
+	 * @param uid
+	 * @return
+	 */
+	public long countShareRecordByUid(Long uid);
+
+	/**
+	 * 澶氬晢鍝佸垎浜�
+	 * @param uid
+	 * @param source
+	 * @param title
+	 * @param listGoods
+	 * @return
+	 * @throws UserShareGoodsRecordException
+	 */
+	public ShareInfoDTO saveShareRecord(Long uid, ShareSourceTypeEnum source, String title, List<TaoBaoGoodsBrief> listGoods)
+			throws UserShareGoodsRecordException;
+
 }

--
Gitblit v1.8.0