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

yj

2020-03-13 1da0cccd804b441ac94a35f28a2ed23a6a7062cc

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

@@ -17,6 +17,7 @@
import org.jsoup.nodes.Document;

import org.jsoup.nodes.Element;

import org.jsoup.select.Elements;

import org.yeshi.utils.HttpUtil;



import com.yeshi.fanli.dto.dataoke.DingDongQiangDTO;

import com.yeshi.fanli.dto.dataoke.DingDongTime;

@@ -565,12 +566,11 @@
      String desc = detail.getDtitle();

      desc += "\n";

      desc += String.format("券后价%s【%s元】包邮秒杀 ", Math.random() > 0.5 ? "💰" : "",

            MoneyBigDecimalUtil.getWithNoZera(detail.getActualPrice() ).toString())

            MoneyBigDecimalUtil.getWithNoZera(detail.getActualPrice()).toString())

            + (Math.random() > 0.5 ? getRandomCommonEmoji() : "");

      desc += "\n";

      // desc += detail.getIntroduce();

      String introduce = detail.getDesc().replace("，", ",").replace("。", ",").replace("！", ",").replace(",",

            ",");

      String introduce = detail.getDesc().replace("，", ",").replace("。", ",").replace("！", ",").replace(",", ",");

      introduce = introduce.replace(",,,", ",").replace(",,", ",");



      String[] sts = introduce.split(",");

@@ -585,7 +585,6 @@
      desc += introduce;

      return desc;

   }





   public static TaoBaoGoodsBrief filterTaoBaoGoods(TaoBaoGoodsBrief goods, DaTaoKeDetailV2 detail) {

      if (detail != null && goods != null) {

@@ -676,4 +675,20 @@
      return list;

   }



   // 获取推广文案

   public static void getPublishDoc(String id) {

      String url = String.format("http://www.dataoke.com/detailtpl?gid=%s&type=1", id);

      String response = HttpUtil.get(url);

      try {

         JSONObject json = JSONObject.fromObject(new String(response.getBytes("ISO-8859-1"), "UTF-8"));

         JSONObject data = json.optJSONObject("data");

         String tpl2 = data.optString("tpl2");

         tpl2 = tpl2.substring(0, tpl2.indexOf("---------"));

         System.out.println(tpl2.replace("</br>", "\n").trim());

      } catch (Exception e) {



      }



   }



}