From d6c8cce305427ba64005d4e349e169446e0d1801 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 01 八月 2019 09:12:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareStorageControllerV2.java |   45 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 45 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareStorageControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareStorageControllerV2.java
index adbc194..33aaece 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareStorageControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareStorageControllerV2.java
@@ -56,6 +56,51 @@
 	@Resource
 	private UserGoodsStorageService userGoodsStorageService;
 
+	
+
+	/**
+	 *  鍗曚釜鍟嗗搧鍔犲叆閫夊搧搴�
+	 * 
+	 * @param callback
+	 * @param storageIds
+	 *            id鏁扮粍
+	 * @param out
+	 */
+	@RequestMapping(value = "accordtorage", method = RequestMethod.POST)
+	public void accordtorage(AcceptData acceptData, Long uid, long id, Integer goodsType, PrintWriter out) {
+
+		if (uid == null) {
+			out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
+			return;
+		}
+		
+		if (goodsType == null) {
+			goodsType = Constant.SOURCE_TYPE_TAOBAO;
+		}
+		
+		try {
+			UserGoodsStorage userGoodsStorage = userGoodsStorageService.getByUidAndAuctionId(uid, id, goodsType);
+			boolean storageState = false;
+			if (userGoodsStorage != null) {
+				// 鍙栨秷鍔犲叆閫夊搧搴�
+				userGoodsStorageService.deleteByPrimaryKey(userGoodsStorage.getId());
+			} else {
+				// 鍔犲叆閫夊搧搴�
+				Set<Long> set = new HashSet<Long>();
+				set.add(id);
+				userGoodsStorageService.save(uid, set, goodsType);
+				storageState = true;
+			}
+			
+			JSONObject data = new JSONObject();
+			data.put("storageState", storageState);
+			out.print(JsonUtil.loadTrueResult(data));
+		} catch (Exception e) {
+			out.print(JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+			e.printStackTrace();
+		}
+	}
+	
 	/**
 	 * 鎵归噺娣诲姞閫夊搧搴�
 	 * 

--
Gitblit v1.8.0