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

admin

2019-07-30 cebb70396a159270ce84cb44caeafa82faa439a4

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

@@ -425,8 +425,11 @@
         CommonGoods commonGoods = userGoodsStorage.getCommonGoods();

         BigDecimal money = CommonGoodsUtil.getCommission(commonGoods, rate);

         totalMoney = MoneyBigDecimalUtil.add(totalMoney, money);

			
         listCommonGoods.add(commonGoods);

			
         if (goodsType == null) {

            goodsType = commonGoods.getGoodsType();

         }

      }

      

      ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsStorageV2(uid, listCommonGoods, listStorageID);