Merge remote-tracking branch 'origin/master'

admin

2019-04-22 36a6c7f1d1bc054a987aeabb4ab6d9f1278d8e4d

 fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java

@@ -1,6 +1,7 @@
package com.yeshi.fanli.util.jd;



import java.io.IOException;

import java.math.BigDecimal;

import java.util.HashMap;

import java.util.Map;



@@ -12,6 +13,11 @@
import org.jsoup.select.Elements;

import org.yeshi.utils.HttpUtil;



import com.yeshi.fanli.dto.jd.JDCommissionInfo;

import com.yeshi.fanli.dto.jd.JDCouponInfo;

import com.yeshi.fanli.dto.jd.JDSearchFilter;

import com.yeshi.fanli.dto.jd.JDShopInfo;

import com.yeshi.fanli.entity.jd.JDGoods;

import com.yeshi.fanli.util.StringUtil;



import net.sf.json.JSONObject;

@@ -86,18 +92,18 @@
   }



   @SuppressWarnings("deprecation")

   public static void searchByKey(String key) {

   public static void searchByKey(JDSearchFilter searchFilter) {

      JSONObject params = new JSONObject();

      params.put("pageNo", 1);

      params.put("pageSize", 20);

      params.put("pageNo", searchFilter.getPageNo());

      params.put("pageSize", searchFilter.getPageSize());

      params.put("searchUUID", StringUtil.Md5(System.currentTimeMillis() + ""));

      JSONObject data = new JSONObject();

      data.put("deliveryType", "0");

      data.put("hasCoupon", "0");

      data.put("hasCoupon", searchFilter.getHasCoupon());

      data.put("isCare", "0");

      data.put("isPinGou", "0");

      data.put("isZY", "0");

      data.put("key", key);

      data.put("isZY", searchFilter.getIsZY());

      data.put("key", searchFilter.getKey());

      data.put("keywordType", "kt1");

      data.put("lock", "");

      data.put("orientationFlag", "");

@@ -118,4 +124,42 @@
      }

   }



   private static JDGoods parseGoods(String data) {

      JDGoods goods = new JDGoods();

      JSONObject json = JSONObject.fromObject(data);

      goods.setSkuId(json.optLong("skuId"));

      goods.setSkuName(json.optString("skuName"));

      JDShopInfo shopInfo = new JDShopInfo();

      shopInfo.setShopId(json.optInt("shopId"));

      shopInfo.setShopName(json.optString("shopName"));

      goods.setShopInfo(shopInfo);



      goods.setPrice(new BigDecimal(json.optString("finalPrice")));

      goods.setGoodCommentsShare(new BigDecimal(json.optString("goodCommentsShare")));

      goods.setInOrderCount30Days(json.optLong("inOrderCount30Days"));

      if (json.optInt("isZY") == 1)

         goods.setOwner("g");

      else

         goods.setOwner("p");

      goods.setMaterialUrl(json.optString("materialUrl"));

      JDCommissionInfo commission = new JDCommissionInfo();

      commission.setCommission(new BigDecimal(json.optString("wlCommission")));

      commission.setCommissionShare(new BigDecimal(json.optString("wlCommissionRatio")));

      goods.setCommissionInfo(commission);

      goods.setGoodCommentsShare(new BigDecimal(json.optString("goodCommentsShare")));



      if (json.optString("hasCoupon") != null && json.optInt("hasCoupon") == 1

            && json.optInt("couponRemainCnt") > 0) {

         // 有券

         JDCouponInfo coupon = new JDCouponInfo();

         coupon.setDiscount(new BigDecimal(json.optString("couponDiscount")));

         coupon.setQuota(new BigDecimal(json.optString("couponQuota")));

         coupon.setLink("https:" + json.optString("couponLink"));

         goods.setCouponInfo(coupon);

      } else {

         // 无券

      }

      return goods;

   }



}