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

admin

2019-08-02 90b211c63f9d596aa90b508f76eb916a30b68731

 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("拼团价");

@@ -431,6 +430,7 @@
      // 京东自营标签

      String owner = goods.getOwner();

      if (!StringUtil.isNullOrEmpty(owner) && "g".equalsIgnoreCase(owner)) {

         goodsInfo.setShopType(21); // 京东自营

         if (labels == null) {

            labels = new ArrayList<ClientTextStyleVO>();

         }

@@ -438,8 +438,6 @@
         textStyleVO.setContent("京东自营");

         textStyleVO.setColor("#E42219");

         labels.add(textStyleVO);

         goodsInfo.setLabels(labels);

         goodsInfo.setShopType(21); // 京东自营

      } else {

         goodsInfo.setShopType(20); // 京东

      }

@@ -455,13 +453,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();