From d222232204b5ba3d3039ae8689dad743ea06723f Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 12 七月 2019 09:12:51 +0800
Subject: [PATCH] Merge branch 'master' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserGoodsStorageController.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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 3d91ea0..0cebf8e 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
@@ -46,7 +46,7 @@
* @param out
*/
@RequestMapping(value = "accordtorage", method = RequestMethod.POST)
- public void accordtorage(AcceptData acceptData, Long uid, Long auctionId, PrintWriter out) {
+ public void accordtorage(AcceptData acceptData, Long uid, Long auctionId, Integer goodsType, PrintWriter out) {
if (auctionId == null) {
out.print(JsonUtil.loadFalseResult("鏈�夋嫨鍟嗗搧"));
@@ -59,8 +59,8 @@
}
try {
-
- UserGoodsStorage userGoodsStorage = userGoodsStorageService.getByUidAndAuctionId(uid, auctionId);
+ goodsType = 2;
+ UserGoodsStorage userGoodsStorage = userGoodsStorageService.getByUidAndAuctionId(uid, auctionId, goodsType);
boolean storageState = false;
if (userGoodsStorage != null) {
// 鍙栨秷鍔犲叆閫夊搧搴�
@@ -69,7 +69,7 @@
// 鍔犲叆閫夊搧搴�
Set<Long> set = new HashSet<Long>();
set.add(auctionId);
- userGoodsStorageService.save(uid, set);
+ userGoodsStorageService.save(uid, set, goodsType);
storageState = true;
}
@@ -94,7 +94,7 @@
* @param out
*/
@RequestMapping(value = "addstorage", method = RequestMethod.POST)
- public void addStorage(AcceptData acceptData, Long uid, String auctionIds, PrintWriter out) {
+ public void addStorage(AcceptData acceptData, Long uid, String auctionIds, Integer goodsType,PrintWriter out) {
try {
Gson gson = new Gson();
Set<Long> set = gson.fromJson(auctionIds, new TypeToken<HashSet<Long>>() {}.getType());
@@ -103,7 +103,7 @@
return;
}
- userGoodsStorageService.save(uid, set);
+ userGoodsStorageService.save(uid, set, goodsType);
out.print(JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
} catch (UserGoodsStorageException e) {
@@ -143,9 +143,9 @@
JSONObject data = new JSONObject();
JSONArray array = new JSONArray();
- long count = userGoodsStorageService.countQueryByUid(uid);
+ long count = userGoodsStorageService.countQueryByUid(uid, null);
if (count > 0) {
- array = userGoodsStorageService.getMyStorage((page - 1) * pageSize, pageSize, uid);
+ array = userGoodsStorageService.getMyStorage((page - 1) * pageSize, pageSize, uid, null);
}
data.put("count", count);
@@ -208,7 +208,7 @@
* @param out
*/
@RequestMapping(value = "sharegoods", method = RequestMethod.POST)
- public void shareGoods(AcceptData acceptData, Long uid, String storageIds, PrintWriter out) {
+ public void shareGoods(AcceptData acceptData, Long uid, String storageIds, Integer goodsType, PrintWriter out) {
if (StringUtil.isNullOrEmpty(storageIds)) {
out.print(JsonUtil.loadFalseResult("鍒嗕韩鍟嗗搧涓嶈兘涓虹┖"));
@@ -221,7 +221,6 @@
}
try {
-
Gson gson = new Gson();
List<Long> listStorageID = gson.fromJson(storageIds, new TypeToken<ArrayList<Long>>() {}.getType());
if (listStorageID == null || listStorageID.size() < 9) {
@@ -234,8 +233,11 @@
return;
}
+ if (goodsType == null) {
+ goodsType = Constant.SOURCE_TYPE_TAOBAO;
+ }
- JSONObject data = userGoodsStorageService.shareGoods(uid, listStorageID);
+ JSONObject data = userGoodsStorageService.shareGoods(uid, listStorageID, goodsType);
out.print(JsonUtil.loadTrueResult(data));
} catch (UserGoodsStorageException e) {
--
Gitblit v1.8.0