From f4548a3ee46afe45da4ee2a42dc169c575deee9f Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 31 七月 2019 11:57:36 +0800
Subject: [PATCH] 动态v2兼容

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserGoodsStorageController.java |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserGoodsStorageController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserGoodsStorageController.java
index 0cebf8e..74067b1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserGoodsStorageController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserGoodsStorageController.java
@@ -57,9 +57,12 @@
 			out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
 			return;
 		}
-
+		
+		if (goodsType == null) {
+			goodsType = Constant.SOURCE_TYPE_TAOBAO;
+		}
+		
 		try {
-			goodsType = 2;
 			UserGoodsStorage userGoodsStorage = userGoodsStorageService.getByUidAndAuctionId(uid, auctionId, goodsType);
 			boolean storageState = false;
 			if (userGoodsStorage != null) {
@@ -103,6 +106,9 @@
 				return;
 			}
 
+			if (goodsType == null) {
+				goodsType = Constant.SOURCE_TYPE_TAOBAO;
+			}
 			userGoodsStorageService.save(uid, set, goodsType);
 			out.print(JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
 
@@ -208,7 +214,7 @@
 	 * @param out
 	 */
 	@RequestMapping(value = "sharegoods", method = RequestMethod.POST)
-	public void shareGoods(AcceptData acceptData, Long uid, String storageIds, Integer goodsType, PrintWriter out) {
+	public void shareGoods(AcceptData acceptData, Long uid, String storageIds, PrintWriter out) {
 
 		if (StringUtil.isNullOrEmpty(storageIds)) {
 			out.print(JsonUtil.loadFalseResult("鍒嗕韩鍟嗗搧涓嶈兘涓虹┖"));
@@ -232,12 +238,8 @@
 				out.print(JsonUtil.loadFalseResult("鍒嗕韩鍟嗗搧鏁伴噺鍙兘鏄�9涓�"));
 				return;
 			}
-			
-			if (goodsType == null) {
-				goodsType = Constant.SOURCE_TYPE_TAOBAO;
-			}
 
-			JSONObject data = userGoodsStorageService.shareGoods(uid, listStorageID, goodsType);
+			JSONObject data = userGoodsStorageService.shareGoods(uid, listStorageID);
 			out.print(JsonUtil.loadTrueResult(data));
 			
 		} catch (UserGoodsStorageException e) {

--
Gitblit v1.8.0