From 5981b2cae7c20ec9021c8ccbe1a926f35f640210 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 03 一月 2019 17:43:18 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserGoodsStorageController.java | 105 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 81 insertions(+), 24 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 e905280..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
@@ -20,7 +20,9 @@
import com.google.gson.reflect.TypeToken;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.UserGoodsStorage;
+import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
import com.yeshi.fanli.exception.user.UserGoodsStorageException;
+import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
@@ -30,10 +32,59 @@
public class UserGoodsStorageController {
@Resource
+ private ConfigService configService;
+
+ @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 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
@@ -88,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) {
@@ -144,19 +195,21 @@
}
+
+
/**
- * 鏍规嵁鍟嗗搧id绉婚櫎閫夊搧搴�
+ * 鍒嗕韩鍟嗗搧杩斿洖浜岀淮鐮佸浘鐗�
*
* @param callback
* @param storageIds
* id鏁扮粍
* @param out
*/
- @RequestMapping(value = "accordtorage", method = RequestMethod.POST)
- public void accordtorage(AcceptData acceptData, Long uid, Long auctionId, PrintWriter out) {
+ @RequestMapping(value = "sharegoods", method = RequestMethod.POST)
+ public void shareGoods(AcceptData acceptData, Long uid, String storageIds, PrintWriter out) {
- if (auctionId == null) {
- out.print(JsonUtil.loadFalseResult("鏈�夋嫨鍟嗗搧"));
+ if (StringUtil.isNullOrEmpty(storageIds)) {
+ out.print(JsonUtil.loadFalseResult("鍒嗕韩鍟嗗搧涓嶈兘涓虹┖"));
return;
}
@@ -166,29 +219,33 @@
}
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;
+
+ Gson gson = new Gson();
+ List<Long> listStorageID = gson.fromJson(storageIds, new TypeToken<ArrayList<Long>>() {}.getType());
+ if (listStorageID == null || listStorageID.size() < 9) {
+ out.print(JsonUtil.loadFalseResult("鍒嗕韩鍟嗗搧鏁伴噺涓嶈冻"));
+ return;
}
- JSONObject data = new JSONObject();
- data.put("storageState", storageState);
- out.print(JsonUtil.loadTrueResult(data));
+ if (listStorageID.size() != 9) {
+ out.print(JsonUtil.loadFalseResult("鍒嗕韩鍟嗗搧鏁伴噺鍙兘鏄�9涓�"));
+ return;
+ }
+
+ JSONObject data = userGoodsStorageService.shareGoods(uid, listStorageID);
+ out.print(JsonUtil.loadTrueResult(data));
+
+ } catch (UserGoodsStorageException e) {
+ out.print(JsonUtil.loadFalseResult("鍒嗕韩澶辫触"));
+ e.printStackTrace();
+ } catch (UserShareGoodsRecordException e) {
+ out.print(JsonUtil.loadFalseResult("鍒嗕韩澶辫触"));
+ e.printStackTrace();
} catch (Exception e) {
- out.print(JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ out.print(JsonUtil.loadFalseResult("鍒嗕韩澶辫触"));
e.printStackTrace();
}
}
-
}
--
Gitblit v1.8.0