yujian
2019-08-02 d5b668277543c92f4e98aaeab37a2b5aa6e1da5b
fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java
@@ -93,10 +93,13 @@
            goodsInfo.setBaoyou(true);
         }
         
         List<ClientTextStyleVO> labels = goodsInfo.getLabels();
         // 自营
         String owner = otherDTO.getOwner();
         if (!StringUtil.isNullOrEmpty(owner) && "g".equalsIgnoreCase(owner)) {
            List<ClientTextStyleVO> labels = new ArrayList<ClientTextStyleVO>();
            if (labels == null) {
               labels = new ArrayList<ClientTextStyleVO>();
            }
            ClientTextStyleVO textStyleVO = new ClientTextStyleVO();
            textStyleVO.setContent("京东自营");
            textStyleVO.setColor("#E42219");
@@ -108,6 +111,15 @@
         if (pinGouInfo != null) {
            goods.setPrice(pinGouInfo.getPingouPrice());
            goodsInfo.setPriceName("拼购价");
            if (labels == null) {
               labels = new ArrayList<ClientTextStyleVO>();
            }
            ClientTextStyleVO textStyleVO = new ClientTextStyleVO();
            textStyleVO.setContent("拼购");
            textStyleVO.setColor("#FF9600");
            labels.add(textStyleVO);
            goodsInfo.setLabels(labels);
         } else {
            goodsInfo.setPriceName("京东价");
         }
@@ -382,14 +394,6 @@
      }
      goodsInfo.setSalesCount(salesCountMidea);
      JDPingouInfo pinGouInfo = goods.getPinGouInfo();
      if (pinGouInfo != null) {
         goodsInfo.setZkPrice(pinGouInfo.getPingouPrice());
         goodsInfo.setPriceName("拼购价");
      } else {
         goodsInfo.setZkPrice(goods.getPrice());
         goodsInfo.setPriceName("京东价");
      }
      // 资金信息
      MoneyInfoVO moneyInfoVO = new MoneyInfoVO();
@@ -423,10 +427,13 @@
         goodsInfo.setCouponInfo(coupon);
      }
      List<ClientTextStyleVO> labels = goodsInfo.getLabels();
      // 京东自营标签
      String owner = goods.getOwner();
      if (!StringUtil.isNullOrEmpty(owner) && "g".equalsIgnoreCase(owner)) {
         List<ClientTextStyleVO> labels = new ArrayList<ClientTextStyleVO>();
         if (labels == null) {
            labels = new ArrayList<ClientTextStyleVO>();
         }
         ClientTextStyleVO textStyleVO = new ClientTextStyleVO();
         textStyleVO.setContent("京东自营");
         textStyleVO.setColor("#E42219");
@@ -437,6 +444,25 @@
         goodsInfo.setShopType(20); // 京东
      }
      JDPingouInfo pinGouInfo = goods.getPinGouInfo();
      if (pinGouInfo != null) {
         goodsInfo.setZkPrice(pinGouInfo.getPingouPrice());
         goodsInfo.setPriceName("拼购价");
         if (labels == null) {
            labels = new ArrayList<ClientTextStyleVO>();
         }
         ClientTextStyleVO textStyleVO = new ClientTextStyleVO();
         textStyleVO.setContent("拼购");
         textStyleVO.setColor("#FF9600");
         labels.add(textStyleVO);
         goodsInfo.setLabels(labels);
      } else {
         goodsInfo.setZkPrice(goods.getPrice());
         goodsInfo.setPriceName("京东价");
      }
      // 店铺信息
      JDShopInfo shopInfo = goods.getShopInfo();
      if (shopInfo != null && !StringUtil.isNullOrEmpty(shopInfo.getShopName())) {