From ca7aa881987169d3d0202fe85d9f47d225111f33 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 01 三月 2019 18:34:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserGoodsStorageController.java | 104 ++++++++++++++++++++++++++++------------------------
1 files changed, 56 insertions(+), 48 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserGoodsStorageController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserGoodsStorageController.java
index be52b60..02e018d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserGoodsStorageController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserGoodsStorageController.java
@@ -38,7 +38,53 @@
private UserGoodsStorageService userGoodsStorageService;
/**
- * 娣诲姞閫夊搧搴�
+ * 鍗曚釜鍟嗗搧鍔犲叆閫夊搧搴�
+ *
+ * @param callback
+ * @param storageIds
+ * id鏁扮粍
+ * @param out
+ */
+ @RequestMapping(value = "accordtorage", method = RequestMethod.POST)
+ public void accordtorage(AcceptData acceptData, Long uid, Long auctionId, PrintWriter out) {
+
+ if (auctionId == null) {
+ out.print(JsonUtil.loadFalseResult("鏈�夋嫨鍟嗗搧"));
+ return;
+ }
+
+ if (uid == null) {
+ out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
+ return;
+ }
+
+ try {
+
+ UserGoodsStorage userGoodsStorage = userGoodsStorageService.getByUidAndAuctionId(uid, auctionId);
+ boolean storageState = false;
+ if (userGoodsStorage != null) {
+ // 鍙栨秷鍔犲叆閫夊搧搴�
+ userGoodsStorageService.deleteByPrimaryKey(userGoodsStorage.getId());
+ } else {
+ // 鍔犲叆閫夊搧搴�
+ Set<Long> set = new HashSet<Long>();
+ set.add(auctionId);
+ userGoodsStorageService.save(uid, set);
+ storageState = true;
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("storageState", storageState);
+ out.print(JsonUtil.loadTrueResult(data));
+
+ } catch (Exception e) {
+ out.print(JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 鎵归噺娣诲姞閫夊搧搴�
*
* @param acceptData
* @param uid
@@ -93,7 +139,7 @@
int pageSize = Constant.PAGE_SIZE;
JSONObject data = new JSONObject();
- JSONArray array = null;
+ JSONArray array = new JSONArray();
long count = userGoodsStorageService.countQueryByUid(uid);
if (count > 0) {
@@ -149,54 +195,10 @@
}
- /**
- * 鍗曚釜鍟嗗搧鍔犲叆閫夊搧搴�
- *
- * @param callback
- * @param storageIds
- * id鏁扮粍
- * @param out
- */
- @RequestMapping(value = "accordtorage", method = RequestMethod.POST)
- public void accordtorage(AcceptData acceptData, Long uid, Long auctionId, PrintWriter out) {
-
- if (auctionId == null) {
- out.print(JsonUtil.loadFalseResult("鏈�夋嫨鍟嗗搧"));
- return;
- }
-
- if (uid == null) {
- out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
- return;
- }
-
- try {
-
- UserGoodsStorage userGoodsStorage = userGoodsStorageService.getByUidAndAuctionId(uid, auctionId);
- boolean storageState = false;
- if (userGoodsStorage != null) {
- // 鍙栨秷鍔犲叆閫夊搧搴�
- userGoodsStorageService.deleteByPrimaryKey(userGoodsStorage.getId());
- } else {
- // 鍔犲叆閫夊搧搴�
- Set<Long> set = new HashSet<Long>();
- set.add(auctionId);
- userGoodsStorageService.save(uid, set);
- storageState = true;
- }
-
- JSONObject data = new JSONObject();
- data.put("storageState", storageState);
- out.print(JsonUtil.loadTrueResult(data));
-
- } catch (Exception e) {
- out.print(JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
- e.printStackTrace();
- }
- }
+
/**
- * 鍒犻櫎
+ * 鍒嗕韩鍟嗗搧杩斿洖浜岀淮鐮佸浘鐗�
*
* @param callback
* @param storageIds
@@ -224,6 +226,12 @@
out.print(JsonUtil.loadFalseResult("鍒嗕韩鍟嗗搧鏁伴噺涓嶈冻"));
return;
}
+
+ if (listStorageID.size() != 9) {
+ out.print(JsonUtil.loadFalseResult("鍒嗕韩鍟嗗搧鏁伴噺鍙兘鏄�9涓�"));
+ return;
+ }
+
JSONObject data = userGoodsStorageService.shareGoods(uid, listStorageID);
out.print(JsonUtil.loadTrueResult(data));
--
Gitblit v1.8.0