Merge remote-tracking branch 'origin/master'

admin

2019-05-22 9b4bf99c1a30f3a7c2bdd6faba7589ff4f7e48e5

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java

@@ -132,8 +132,8 @@
   }

   

   @Override

   public void updateShareState(Long shareId) {

      userGoodsStorageMapper.updateShareState(shareId);

   public void updateShareStateByCommonGoodsId(Long commonGoodsId) {

      userGoodsStorageMapper.updateShareStateByCommonGoodsId(commonGoodsId);

   }



   @Override

@@ -313,14 +313,13 @@
      BigDecimal totalMoney = new BigDecimal(0.00);

      List<TaoBaoGoodsBrief> listGoodsBrief = new ArrayList<TaoBaoGoodsBrief>();

      

      String rateStr = hongBaoManageService.get("hongbao_goods_proportion");

		
      BigDecimal rate = hongBaoManageService.getShareRate();

      for (UserGoodsStorage userGoodsStorage: listResult) {

         CommonGoods commonGoods = userGoodsStorage.getCommonGoods();

         TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(commonGoods);

         listGoodsBrief.add(goodsBrief);

         

         BigDecimal money = TaoBaoUtil.getGoodsHongBaoMoney(goodsBrief, new BigDecimal(rateStr));

         BigDecimal money = TaoBaoUtil.getGoodsHongBaoMoney(goodsBrief, rate);

         totalMoney = MoneyBigDecimalUtil.add(totalMoney, money);

      }