From 09476adf2ae2bcc2f6685dafe4707938fd82bc78 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 25 七月 2019 12:19:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserGoodsStorageController.java | 8 ++------
1 files changed, 2 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 7b46fda..74067b1 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
@@ -214,7 +214,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("鍒嗕韩鍟嗗搧涓嶈兘涓虹┖"));
@@ -238,12 +238,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