yujian
2019-09-02 9eeda0d3049b71877c373c04d65533939b5582ef
fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java
@@ -104,7 +104,6 @@
            textStyleVO.setContent("京东自营");
            textStyleVO.setColor("#E42219");
            labels.add(textStyleVO);
            goodsInfo.setLabels(labels);
         }
         // 拼团价
         JDPingouInfo pinGouInfo = otherDTO.getPinGouInfo();
@@ -117,12 +116,12 @@
            }
            ClientTextStyleVO textStyleVO = new ClientTextStyleVO();
            textStyleVO.setContent("拼购");
            textStyleVO.setColor("#FF9600");
            textStyleVO.setColor("#E42219");
            labels.add(textStyleVO);
            goodsInfo.setLabels(labels);
         } else {
            goodsInfo.setPriceName("京东价");
         }
         goodsInfo.setLabels(labels);
      } else if (goodsType == Constant.SOURCE_TYPE_PDD) {
         goodsInfo.setSalesType(4); // 总销量
         goodsInfo.setPriceName("拼团价");
@@ -134,7 +133,12 @@
      goodsInfo.setGoodsType(goodsType);
      goodsInfo.setZkPrice(goods.getPrice());
      goodsInfo.setState(goods.getState());
      Integer state = goods.getState();
      if (state == null) {
         goodsInfo.setState(0);
      } else {
         goodsInfo.setState(goods.getState());
      }
      goodsInfo.setSalesCount(TaoBaoUtil.getSaleCount(goods.getSales()));
      if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
@@ -302,6 +306,7 @@
      goodsInfo.setSalesCount(TaoBaoUtil.getSaleCount(goods.getBiz30day()));
      //白底图可能有错误  https://img.alicdn.com/bao/uploaded/TB1LVqmVZbpK1RjSZFyXXX_qFXa.png
      if (!StringUtil.isNullOrEmpty(goods.getPictUrlWhite())) {
         goodsInfo.setPicUrl(TbImgUtil.getTBSize320Img(goods.getPictUrlWhite()));
      } else {
@@ -431,6 +436,7 @@
      // 京东自营标签
      String owner = goods.getOwner();
      if (!StringUtil.isNullOrEmpty(owner) && "g".equalsIgnoreCase(owner)) {
         goodsInfo.setShopType(21); // 京东自营
         if (labels == null) {
            labels = new ArrayList<ClientTextStyleVO>();
         }
@@ -438,8 +444,6 @@
         textStyleVO.setContent("京东自营");
         textStyleVO.setColor("#E42219");
         labels.add(textStyleVO);
         goodsInfo.setLabels(labels);
         goodsInfo.setShopType(21); // 京东自营
      } else {
         goodsInfo.setShopType(20); // 京东
      }
@@ -455,13 +459,13 @@
         }
         ClientTextStyleVO textStyleVO = new ClientTextStyleVO();
         textStyleVO.setContent("拼购");
         textStyleVO.setColor("#FF9600");
         textStyleVO.setColor("#E42219");
         labels.add(textStyleVO);
         goodsInfo.setLabels(labels);
      } else {
         goodsInfo.setZkPrice(goods.getPrice());
         goodsInfo.setPriceName("京东价");
      }
      goodsInfo.setLabels(labels);
      
      // 店铺信息
      JDShopInfo shopInfo = goods.getShopInfo();