From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserGoodsStorageService.java |   41 ++++++++++++++++++++++++++---------------
 1 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserGoodsStorageService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserGoodsStorageService.java
index 7f9b6ac..9e1b2ac 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserGoodsStorageService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserGoodsStorageService.java
@@ -3,14 +3,12 @@
 import java.util.List;
 import java.util.Set;
 
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
-import org.apache.ibatis.annotations.Param;
-
 import com.yeshi.fanli.entity.bus.user.UserGoodsStorage;
 import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
 import com.yeshi.fanli.exception.user.UserGoodsStorageException;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
 
 public interface UserGoodsStorageService {
 
@@ -33,10 +31,9 @@
 	 * @param uid
 	 * @return
 	 */
-	public List<UserGoodsStorage> listQueryByUid(@Param("start") long start, @Param("count") int count, 
-			@Param("uid") Long uid);
+	public List<UserGoodsStorage> listQueryByUid(long start, int count, Long uid, Integer source);
 	
-	public long countQueryByUid(@Param("uid") Long uid);
+	public long countQueryByUid(Long uid, Integer source);
 
 	/**
 	 *  鏂板鎴栧垵濮嬪寲鐢ㄦ埛閫夊搧搴�
@@ -45,7 +42,7 @@
 	 * @return
 	 * @throws UserGoodsStorageException
 	 */
-	public void save(Long uid, Set<Long> auctionIds) throws UserGoodsStorageException;
+	public void save(Long uid, Set<Long> auctionIds, Integer goodsType) throws UserGoodsStorageException;
 
 	/**
 	 * 鎵归噺鍒犻櫎
@@ -62,7 +59,7 @@
 	 * @return
 	 * @throws UserGoodsStorageException
 	 */
-	public JSONArray getMyStorage(int page, int pageSize, Long uid) throws UserGoodsStorageException;
+	public JSONArray getMyStorage(int page, int pageSize, Long uid, Integer source) throws UserGoodsStorageException;
 
 	/**
 	 * 鏍规嵁涓婚敭 銆乽id 鎵归噺鍒犻櫎
@@ -77,7 +74,7 @@
 	 * @param auctionId 娣樺疂鍟嗗搧 id
 	 * @return
 	 */
-	public UserGoodsStorage getByUidAndAuctionId(Long uid, Long auctionId);
+	public UserGoodsStorage getByUidAndAuctionId(Long uid, Long auctionId, Integer goodsType);
 
 	/**
 	 *  鍒ゆ柇鏄惁灞炰簬閫夊搧搴�
@@ -85,7 +82,7 @@
 	 * @param auctionId 鍟嗗搧id
 	 * @return 
 	 */
-	public boolean isExistStorage(Long uid, Long auctionId);
+	public boolean isExistStorage(Long uid, Long auctionId, Integer goodType);
 
 	/**
 	 * 閫夊搧搴撳垎浜晢鍝�
@@ -97,9 +94,23 @@
 	public JSONObject shareGoods(Long uid, List<Long> listStorageID) throws UserGoodsStorageException, UserShareGoodsRecordException;
 
 	/**
-	 * 鏇存柊鍟嗗搧鐘舵�佷负宸插垎浜�
-	 * @param shareId 鍒嗕韩
+	 * 娣诲姞绠�鐗堝晢鍝佸埌閫夊搧搴�
+	 * @param uid
+	 * @param ids
+	 * @throws UserGoodsStorageException
 	 */
-	public void updateShareStateByCommonGoodsId(Long shareId);
+	public void addCommonGoods(Long uid, Set<Long> ids) throws UserGoodsStorageException;
+
+	/**
+	 * 鍒涘缓鍒嗕韩
+	 * @param uid
+	 * @param listStorageID
+	 * @param needDrawPicture鏄惁闇�瑕佺粯鍥�
+	 * @return
+	 * @throws UserGoodsStorageException
+	 * @throws UserShareGoodsRecordException
+	 */
+	public JSONObject createShareV2(Long uid, List<Long> listStorageID,boolean needDrawPicture)
+			throws UserGoodsStorageException, UserShareGoodsRecordException;
 
 }

--
Gitblit v1.8.0