From cb657522c511a4396f63591beebd5a621bed77ab Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 四月 2020 15:11:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserGoodsStorageController.java | 9 +++------
1 files changed, 3 insertions(+), 6 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 74067b1..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("鏈�夋嫨鍟嗗搧"));
@@ -58,12 +58,9 @@
return;
}
- if (goodsType == null) {
- goodsType = Constant.SOURCE_TYPE_TAOBAO;
- }
try {
- UserGoodsStorage userGoodsStorage = userGoodsStorageService.getByUidAndAuctionId(uid, auctionId, goodsType);
+ UserGoodsStorage userGoodsStorage = userGoodsStorageService.getByUidAndAuctionId(uid, auctionId, Constant.SOURCE_TYPE_TAOBAO);
boolean storageState = false;
if (userGoodsStorage != null) {
// 鍙栨秷鍔犲叆閫夊搧搴�
@@ -72,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;
}
--
Gitblit v1.8.0