Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

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

@@ -132,11 +132,6 @@
   }

   

   @Override

   public void updateShareStateByCommonGoodsId(Long commonGoodsId) {

      userGoodsStorageMapper.updateShareStateByCommonGoodsId(commonGoodsId);

   }



   @Override

   public void save(Long uid, Set<Long> auctionIds) throws UserGoodsStorageException {



      if (uid == null) {

@@ -323,7 +318,7 @@
         totalMoney = MoneyBigDecimalUtil.add(totalMoney, money);

      }

      

      ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsStorage(uid, listGoodsBrief);

      ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsStorage(uid, listGoodsBrief, listStorageID);

      FileUploadResult uploadResult = new FileUploadResult();

      uploadResult.setUrl(shareRecord.getSharePictureUrl());