From d0da0aa5e01dd73b7fca8e59ff2664d7e6076802 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 24 六月 2020 10:09:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java |    2 +-
 1 files changed, 1 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 8ad030b..5d0d662 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
@@ -380,7 +380,7 @@
 			TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(commonGoods);
 			listGoodsBrief.add(goodsBrief);
 
-			BigDecimal money = TaoBaoUtil.getGoodsHongBaoMoney(goodsBrief, rate);
+			BigDecimal money = TaoBaoUtil.getGoodsHongBaoMoney(goodsBrief, rate,true);
 			totalMoney = MoneyBigDecimalUtil.add(totalMoney, money);
 		}
 

--
Gitblit v1.8.0