Merge remote-tracking branch 'origin/master'

yujian

2019-07-10 6b1a7a75b06eafb0bbf7f20d950384a3fde4c8ef

 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java

@@ -705,6 +705,8 @@
      tg.setReservePrice(tb.getReservePrice());

      tg.setUserType(tb.getUserType());

      tg.setShopTitle(tb.getShopTitle());

      tg.setTkRate(tb.getTkRate());

      tg.setSellerId(tb.getSellerId());

      tg.setState(tb.getState()); // 状态：2018-12-03

      if (tb.getCouponAmount().compareTo(BigDecimal.valueOf(0)) > 0) {



@@ -767,13 +769,13 @@
      tg.setSalesType(1);

      // 测试使用

      // tg.setSalesType(Math.random() > 0.5 ? tg.getSalesType() : 3);

      if(Constant.IS_TEST)

      {

       List<ClientTextStyleVO> labels = new ArrayList<>();

       labels.add(new ClientTextStyleVO("标签内容", "#F14242"));

       labels.add(new ClientTextStyleVO("标签内容", "#00FF00"));

       tg.setLabels(labels);

      }

//      if(Constant.IS_TEST)

//      {

//       List<ClientTextStyleVO> labels = new ArrayList<>();

//       labels.add(new ClientTextStyleVO("标签内容", "#F14242"));

//       labels.add(new ClientTextStyleVO("标签内容", "#00FF00"));

//       tg.setLabels(labels);

//      }

      return tg;

   }



@@ -1717,6 +1719,12 @@
      taoBaoGoods.setCouponTotalCount(detail.getCouponTotalNum());

      taoBaoGoods.setPictUrl(detail.getMainPic());

      taoBaoGoods.setPictUrlWhite(detail.getMainPic());

      if (taoBaoGoods.getPictUrl() != null && !taoBaoGoods.getPictUrl().startsWith("http"))

         taoBaoGoods.setPictUrl("https:" + taoBaoGoods.getPictUrl());



      if (taoBaoGoods.getPictUrlWhite() != null && !taoBaoGoods.getPictUrlWhite().startsWith("http"))

         taoBaoGoods.setPictUrlWhite("https:" + taoBaoGoods.getPictUrlWhite());



      taoBaoGoods.setSellerId(detail.getSellerId());

      taoBaoGoods.setShopTitle(detail.getShopName());

      taoBaoGoods.setTitle(detail.getDtitle());