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

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

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

@@ -22,6 +22,7 @@
import com.yeshi.fanli.entity.bus.user.UserGoodsStorage;

import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.jd.JDGoods;

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.exception.goods.CommonGoodsException;

import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;

@@ -217,7 +218,7 @@
   }



   @Override

   @Transactional

   @Transactional(rollbackFor=Exception.class)

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



      if (uid == null) {

@@ -391,7 +392,7 @@
      data.put("revenue", listGoodsBrief.size() + "个商品预估分享奖金：¥" + totalMoney);

      data.put("shareId", shareRecord.getRedisKey());

      data.put("shareImg", uploadResult);

      data.put("notifyDesc", configService.get("goods_share_multiple_notify"));

      data.put("notifyDesc", configService.get(ConfigKeyEnum.goodsShareMultipleNotify.getKey()));

      return data;

   }



@@ -444,12 +445,12 @@
      // 提示语不同

      if (goodsType == Constant.SOURCE_TYPE_JD) {

         // 京东

         data.put("notifyDesc", configService.get("goods_share_notify_jd"));

         data.put("notifyDesc", configService.get(ConfigKeyEnum.goodsShareNotifyJD.getKey()));

      } else if (goodsType == Constant.SOURCE_TYPE_PDD) {

         // 拼多多

         data.put("notifyDesc", configService.get("goods_share_notify_pdd"));

         data.put("notifyDesc", configService.get(ConfigKeyEnum.goodsShareNotifyPDD.getKey()));

      } else {

         data.put("notifyDesc", configService.get("goods_share_multiple_notify"));

         data.put("notifyDesc", configService.get(ConfigKeyEnum.goodsShareMultipleNotify.getKey()));

      }

      return data;

   }