Merge remote-tracking branch 'origin/master'

admin

2018-12-12 dc73adfa9d92d11d1a8512778deacc34fa877eef

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

@@ -325,6 +325,8 @@
      BigDecimal totalMoney = new BigDecimal(0.00);

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

      

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

		
      for (UserGoodsStorage userGoodsStorage: listStorage) {

         CommonGoods commonGoods = userGoodsStorage.getCommonGoods();

         TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(commonGoods);

@@ -333,13 +335,13 @@
         userGoodsStorage.setState(1);

         userGoodsStorage.setUpdateTime(new Date());

         

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

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

         totalMoney = MoneyBigDecimalUtil.add(totalMoney, money);

      }

      

      String revenue = listGoodsBrief.size() + "个商品预估分享奖金：¥"+totalMoney;

      FileUploadResult loadResult = userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.storage, listGoodsBrief);

      FileUploadResult loadResult = userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.storage, 
            null, listGoodsBrief);



      // 更新为已分享

      userGoodsStorageMapper.updateBatchSelective(listStorage);