Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

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

@@ -10,6 +10,7 @@


import org.springframework.core.task.TaskExecutor;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.entity.FileUploadResult;



@@ -216,6 +217,7 @@


   

   @Override

   @Transactional

   public void addCommonGoods(Long uid, Set<Long> ids) throws UserGoodsStorageException {



      if (uid == null) {

@@ -425,8 +427,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);