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

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 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;

@@ -29,6 +30,7 @@
import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

@@ -130,41 +132,10 @@
         "🕦",// 十一点半

   };



   static final String[] evaluateEmojis = new String[] { 
      "💟",

      "🌸",

      "🍸",

      "🍺",

      "📢",

      "❤",

      "💝",

      "💋",

      "👛",

      "🐾",

      "🌹",

      "🔥",

      "🎉",

      "🎁",

      "🍥",

      "🍭",

      "🌺",

      "👑",

      "✨",

      "💫",

      "🍻",

      "🎈",

      "💥",

      "💕",

      "💞",

      "💰",

      "💌",

      "💭",

      "🌼",

      "🍀"

   };

	
	
	
   static final String[] evaluateEmojis = new String[] { "💟", "🌸", "🍸", "🍺", "📢", "❤", "💝", "💋", "👛", "🐾",

         "🌹", "🔥", "🎉", "🎁", "🍥", "🍭", "🌺", "👑", "✨", "💫", "🍻", "🎈", "💥", "💕", "💞", "💰", "💌", "💭",

         "🌼", "🍀" };



   public static List<GoodsClass> goodsClasses;

   static {

      goodsClasses = new ArrayList<>();

@@ -554,23 +525,21 @@
      return commonEmojis[(int) (Math.random() * commonEmojis.length)];

   }



	
   public static String getEvaluateEmojis() {

      return evaluateEmojis[(int) (Math.random() * evaluateEmojis.length)];

   }

	


   public static String getDesc(DaTaoKeDetailV2 detail) {



      // 标题+券后价+包邮+描述

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

@@ -586,15 +555,51 @@
      return desc;

   }





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

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

   public static TaoBaoGoodsBrief filterTaoBaoGoods(TaoBaoGoodsBrief goods, DaTaoKeDetailV2 v2,

         boolean filterCouponInfo) {

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

         // 重新设置标题与券价格

         goods.setTitle(detail.getDtitle());

         if (!StringUtil.isNullOrEmpty(detail.getMainPic()))

            goods.setPictUrlWhite(detail.getMainPic());

         goods.setTitle(v2.getDtitle());

         if (!StringUtil.isNullOrEmpty(v2.getMainPic()))

            goods.setPictUrlWhite(v2.getMainPic());

         // 如果没有券信息,则提供券信息

         if (StringUtil.isNullOrEmpty(goods.getCouponInfo()) && v2 != null

               && !StringUtil.isNullOrEmpty(v2.getCouponLink())) {

            try {

               long time = System.currentTimeMillis();

               // 券在有效期内并且还有剩余券

               if (time >= TimeUtil.convertToTimeTemp(v2.getCouponStartTime(), "yyyy-MM-dd HH:mm:ss")

                     && time <= TimeUtil.convertToTimeTemp(v2.getCouponEndTime(), "yyyy-MM-dd HH:mm:ss")

                     && (v2.getCouponTotalNum() - v2.getCouponReceiveNum()) > 0) {

                  goods.setCouponStartFee(v2.getOriginalPrice());



                  goods.setCouponEffectiveEndTime(TimeUtil.getGernalTime(

                        TimeUtil.convertToTimeTemp(v2.getCouponEndTime(), "yyyy-MM-dd HH:mm:ss"),

                        "yyyy-MM-dd"));

                  goods.setCouponEffectiveStartTime(TimeUtil.getGernalTime(

                        TimeUtil.convertToTimeTemp(v2.getCouponStartTime(), "yyyy-MM-dd HH:mm:ss"),

                        "yyyy-MM-dd"));



                  goods.setCouponAmount(v2.getCouponPrice());

                  goods.setCouponInfo(

                        String.format("满%s元减%s元", v2.getOriginalPrice() + "", v2.getCouponPrice() + ""));

                  goods.setCouponLeftCount(v2.getCouponTotalNum() - v2.getCouponReceiveNum());

                  goods.setCouponLink(v2.getCouponLink());

                  goods.setCouponTotalCount(v2.getCouponTotalNum());

                  goods.setShopCoupon(true);

                  goods.setZkPrice(v2.getOriginalPrice());

               }



            } catch (Exception e) {



            }

         }

      }

      return goods;

   }



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

      return filterTaoBaoGoods(goods, v2, false);

   }



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

@@ -676,4 +681,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) {



      }



   }



}