From d146e7bca73c7605af6b718b5df0b757e0034f0e Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 18 十二月 2018 11:17:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java
index 89e4e34..2d3f951 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java
@@ -4,6 +4,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import javax.annotation.Resource;
@@ -354,20 +355,16 @@
totalMoney = MoneyBigDecimalUtil.add(totalMoney, money);
}
-
-
-
-
String revenue = listGoodsBrief.size() + "涓晢鍝侀浼板垎浜閲戯細楼"+totalMoney;
- JSONObject result = userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.storage,
+ Map<String,Object> map = userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.storage,
null, listGoodsBrief);
JSONObject data = new JSONObject();
data.put("revenue", revenue);
- data.put("shareId", result.get("shareId"));
- data.put("shareImg", result.get("loadResult"));
- data.put("notifyDesc", configService.get("goods_share_notify"));
+ data.put("shareId", map.get("shareId"));
+ data.put("shareImg", map.get("loadResult"));
+ data.put("notifyDesc", configService.get("goods_share_multiple_notify"));
return data;
}
--
Gitblit v1.8.0