From 657916125bfc69a2b5caae571c9dc41010969611 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 15 十二月 2018 15:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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 358ea32..89e4e34 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
@@ -326,12 +326,26 @@
throw new UserGoodsStorageException(1, "閫夊搧搴撳晢鍝佷笉瀛樺湪");
}
+
+ List<UserGoodsStorage> listResult = new ArrayList<UserGoodsStorage>();
+ // 杩樺師椤哄簭 鐢ㄤ簬鍒跺浘
+ for (Long sid: listStorageID) {
+ for (UserGoodsStorage torage: listStorage) {
+ Long id = torage.getId();
+ if (sid == id || sid.equals(id)) {
+ listResult.add(torage);
+ break;
+ }
+ }
+ }
+
+
BigDecimal totalMoney = new BigDecimal(0.00);
List<TaoBaoGoodsBrief> listGoodsBrief = new ArrayList<TaoBaoGoodsBrief>();
String rateStr = hongBaoManageService.get("hongbao_goods_proportion");
- for (UserGoodsStorage userGoodsStorage: listStorage) {
+ for (UserGoodsStorage userGoodsStorage: listResult) {
CommonGoods commonGoods = userGoodsStorage.getCommonGoods();
TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(commonGoods);
listGoodsBrief.add(goodsBrief);
@@ -340,6 +354,10 @@
totalMoney = MoneyBigDecimalUtil.add(totalMoney, money);
}
+
+
+
+
String revenue = listGoodsBrief.size() + "涓晢鍝侀浼板垎浜閲戯細楼"+totalMoney;
JSONObject result = userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.storage,
--
Gitblit v1.8.0