邀请对应奖励红包加入版本区分

yujian

2019-06-26 020d940ae4e16f55f69cef3dd4c8dc0b9764af07

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

@@ -53,6 +53,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoShop;

import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;

import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.goods.TaoBaoLinkService;

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

      // 测试使用

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

       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;

   }



@@ -1698,6 +1702,38 @@
      return taoBaoGoods;

   }



   public static TaoBaoGoodsBrief convert(DaTaoKeDetailV2 detail) {

      TaoBaoGoodsBrief taoBaoGoods = new TaoBaoGoodsBrief();

      taoBaoGoods.setAuctionId(detail.getGoodsId());

      taoBaoGoods.setBiz30day(detail.getMonthSales());

      taoBaoGoods.setCouponAmount(detail.getCouponPrice());

      taoBaoGoods.setCouponInfo(String.format("满%s元减%s元", detail.getCouponConditions(),

            MoneyBigDecimalUtil.getWithNoZera(detail.getCouponPrice())));

      if (detail.getCouponTotalNum() != null && detail.getCouponReceiveNum() != null)

         taoBaoGoods.setCouponLeftCount(detail.getCouponTotalNum() - detail.getCouponReceiveNum());

      else

         taoBaoGoods.setCouponLeftCount(0);

      taoBaoGoods.setCouponStartFee(detail.getOriginalPrice());

      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());

      taoBaoGoods.setUserType(detail.getShopType());

      taoBaoGoods.setZkPrice(detail.getOriginalPrice());

      taoBaoGoods.setTkRate(detail.getCommissionRate());

      taoBaoGoods.setTkCommFee(new BigDecimal("0"));

      taoBaoGoods.setState(0);

      return taoBaoGoods;

   }



   /**

    * 获取淘宝联盟的授权链接

    *