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/util/factory/CommonGoodsFactory.java

@@ -2,6 +2,8 @@


import java.math.BigDecimal;



import com.alibaba.fastjson.JSONObject;

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

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

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

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

@@ -109,6 +111,13 @@
      

      cg.setState(CommonGoods.STATE_NORMAL);

      

      // 其他信息

      GoodsOtherInfoDTO other = new GoodsOtherInfoDTO();

      other.setOwner(owner); // 是否自营

      other.setPinGouInfo( goods.getPinGouInfo());  // 拼购信息

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

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

		
      // 保留字段

      cg.setVideoCover(null);

      cg.setVideoUrl(null);

@@ -147,17 +156,26 @@
      cg.setGoodsType(CommonGoods.GOODS_TYPE_PDD);

      cg.setPicture(goods.getGoodsThumbnailUrl());

      cg.setPictureWhite(null);

      cg.setPrice(MoneyBigDecimalUtil.div(new BigDecimal(goods.getMinNormalPrice()), new BigDecimal(100)));

      cg.setPrice(MoneyBigDecimalUtil.div(new BigDecimal(goods.getMinGroupPrice()), new BigDecimal(100)));

      

      String salesTip = goods.getSalesTip();

      if (StringUtil.isNullOrEmpty(salesTip)) {

         salesTip = "0";

      } else {

         int indexOf = salesTip.indexOf("+");

         if (indexOf > 0) {

            salesTip = salesTip.substring(0, indexOf);

         }

      }

      

      int totalSales = 0;

      if (salesTip.contains("万")) {

         salesTip = salesTip.replace("万", "") + "0000";

         salesTip = salesTip.substring(0, salesTip.indexOf("万"));

         totalSales= (int) (Float.parseFloat(salesTip) * 10000);

      } else {

         totalSales = Integer.parseInt(salesTip);

      }

      cg.setSales(Integer.parseInt(salesTip));

      cg.setSales(totalSales);

      cg.setRate(MoneyBigDecimalUtil.div(new BigDecimal(goods.getPromotionRate()), new BigDecimal(10)));

      cg.setSellerId(goods.getMallId());

      cg.setSellerName(goods.getMallName());