2.1需求

yujian

2020-05-09 7e7db2fa55a9a3af46d4fd8ede0dee147f101d64

 fanli/src/main/java/com/yeshi/fanli/util/factory/CommonGoodsFactory.java

@@ -3,7 +3,9 @@
import java.math.BigDecimal;



import com.alibaba.fastjson.JSONObject;

import com.yeshi.fanli.dto.common.CategoryInfoDTO;

import com.yeshi.fanli.dto.common.GoodsOtherInfoDTO;

import com.yeshi.fanli.dto.jd.JDCategoryInfo;

import com.yeshi.fanli.dto.jd.JDCommissionInfo;

import com.yeshi.fanli.dto.jd.JDCouponInfo;

import com.yeshi.fanli.dto.jd.JDShopInfo;

@@ -13,6 +15,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.jd.JDUtil;



public class CommonGoodsFactory {



@@ -52,6 +55,23 @@
      cg.setVideoUrl(null);

      cg.setState(goods.getState());

      cg.setMaterialLibType(goods.getMaterialLibType());

		
		
      // 分类信息

      CategoryInfoDTO categoryInfo = new CategoryInfoDTO();

      Integer rootCatId = goods.getRootCatId();

      if (rootCatId != null) {

         categoryInfo.setCid1(Long.parseLong(rootCatId.toString()));

      }

      categoryInfo.setCid1Name(goods.getRootCategoryName());

		
      Integer leafCatId = goods.getLeafCatId();

      if (leafCatId != null) {

         categoryInfo.setCid2(Long.parseLong(leafCatId.toString()));

      }

      categoryInfo.setCid2Name(goods.getLeafName());

      cg.setCategoryInfo(JSONObject.toJSON(categoryInfo).toString());

		
      return cg;

   }



@@ -67,7 +87,7 @@
         return null;



      CommonGoods cg = new CommonGoods();

      JDCouponInfo couponInfo = goods.getCouponInfo();

      JDCouponInfo couponInfo = JDUtil.getShowCouponInfo(goods);

      if (couponInfo != null) {

         cg.setCouponStartPrice(couponInfo.getQuota());

         BigDecimal discount = couponInfo.getDiscount();

@@ -80,6 +100,8 @@
         } else {

            cg.setCouponAmount(new BigDecimal(0));

         }

         cg.setCouponLeftCount(1);

         cg.setCouponTotalCount(1);

      }

      

      JDCommissionInfo commissionInfo = goods.getCommissionInfo();

@@ -117,6 +139,20 @@
      other.setPinGouInfo( goods.getPinGouInfo());  // 拼购信息

      other.setIsFreeShipping(goods.getIsFreeShipping()); // 是否包邮

      cg.setOtherInfo(JSONObject.toJSON(other).toString());

		
		
      // 分类信息

      JDCategoryInfo categoryJD = goods.getCategoryInfo();

      if (categoryJD != null) {

         CategoryInfoDTO categoryInfo = new CategoryInfoDTO();

         categoryInfo.setCid1(categoryJD.getCid1());

         categoryInfo.setCid1Name(categoryJD.getCid1Name());

         categoryInfo.setCid2(categoryJD.getCid2());

         categoryInfo.setCid2Name(categoryJD.getCid2Name());

         categoryInfo.setCid3(categoryJD.getCid3());

         categoryInfo.setCid3Name(categoryJD.getCid3Name());

         cg.setCategoryInfo(JSONObject.toJSON(categoryInfo).toString());

      }

      

      // 保留字段

      cg.setVideoCover(null);

@@ -187,6 +223,14 @@
      cg.setVideoUrl(null);

      cg.setState(goods.getState());

      cg.setMaterialLibType(1);

		
      // 分类信息

      CategoryInfoDTO categoryInfo = new CategoryInfoDTO();

      categoryInfo.setCid1(goods.getCategoryId());

      categoryInfo.setCid1Name(goods.getCategoryName());

      cg.setCategoryInfo(JSONObject.toJSON(categoryInfo).toString());

		
		
      return cg;

   }