Merge remote-tracking branch 'origin/div' into div

admin

2020-06-29 48934b8c3da5a6791d0805ff0c1d327da834cc2d

 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);

      }