From 4637d6f780c76f1c5a0f95922c658efe8174be8f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 18:34:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserGoodsStorageController.java | 21 ++++++++++-----------
1 files changed, 10 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 0cebf8e..f2faea9 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, Integer goodsType, PrintWriter out) {
+ public void accordtorage(AcceptData acceptData, Long uid, Long auctionId, PrintWriter out) {
if (auctionId == null) {
out.print(JsonUtil.loadFalseResult("鏈�夋嫨鍟嗗搧"));
@@ -57,10 +57,10 @@
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
return;
}
-
+
+
try {
- goodsType = 2;
- UserGoodsStorage userGoodsStorage = userGoodsStorageService.getByUidAndAuctionId(uid, auctionId, goodsType);
+ UserGoodsStorage userGoodsStorage = userGoodsStorageService.getByUidAndAuctionId(uid, auctionId, Constant.SOURCE_TYPE_TAOBAO);
boolean storageState = false;
if (userGoodsStorage != null) {
// 鍙栨秷鍔犲叆閫夊搧搴�
@@ -69,7 +69,7 @@
// 鍔犲叆閫夊搧搴�
Set<Long> set = new HashSet<Long>();
set.add(auctionId);
- userGoodsStorageService.save(uid, set, goodsType);
+ userGoodsStorageService.save(uid, set, Constant.SOURCE_TYPE_TAOBAO);
storageState = true;
}
@@ -103,6 +103,9 @@
return;
}
+ if (goodsType == null) {
+ goodsType = Constant.SOURCE_TYPE_TAOBAO;
+ }
userGoodsStorageService.save(uid, set, goodsType);
out.print(JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
@@ -208,7 +211,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 +235,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