Merge branch 'master' into div

yujian

2019-07-11 e4a56b57d3e10b9b46eaefe5194bbf98fcc45698

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

@@ -24,6 +24,7 @@
import com.google.gson.GsonBuilder;

import com.yeshi.fanli.dao.mybatis.UserInfoMapper;

import com.yeshi.fanli.dao.mybatis.share.UserShareGoodsRecordMapper;

import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;

import com.yeshi.fanli.dto.share.ShareGoodsRecordDTO;

import com.yeshi.fanli.entity.bus.share.UserShareGoodsGroup;

import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord;

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

import com.yeshi.fanli.entity.bus.user.UserInfo;

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

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

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

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

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

@@ -227,9 +229,9 @@
   }



   @Override

   public void saveSingleShareRecord(Long uid, Long auctionId, Integer goodsType)

   public void saveSingleShareRecord(Long uid, Long goodsId, Integer goodsType)

         throws UserShareGoodsRecordException {

      if (auctionId == null) {

      if (goodsId == null) {

         throw new UserShareGoodsRecordException(1, "分享商品不能为空");

      }



@@ -243,13 +245,21 @@


      CommonGoods convertGoods = null;

      if (goodsType == Constant.SOURCE_TYPE_JD) {



         JDGoods jdGoods = redisManager.getJDGoods(goodsId);

         if (jdGoods == null) {

            throw new UserShareGoodsRecordException(1, "商品已下架");

         }

         convertGoods = CommonGoodsFactory.create(jdGoods);

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



         PDDGoodsDetail pddGoods = redisManager.getPDDGoodsDetail(goodsId);

         if (pddGoods == null) {

            throw new UserShareGoodsRecordException(1, "商品已下架");

         }

         convertGoods = CommonGoodsFactory.create(pddGoods);

      } else {

         TaoBaoGoodsBrief goodsBrief = null;

         try {

            goodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);

            goodsBrief = redisManager.getTaoBaoGoodsBrief(goodsId);

         } catch (TaobaoGoodsDownException e) {

            throw new UserShareGoodsRecordException(1, "商品已下架");

         }