From e782b2bcfd89f7ce2e3079c7ebb0867bb00124a7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 01 四月 2019 18:54:27 +0800
Subject: [PATCH] 爬单修改

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java |   73 +++++++++---------------------------
 1 files changed, 18 insertions(+), 55 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
index 904a707..304b648 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
@@ -39,7 +39,6 @@
 import com.google.gson.reflect.TypeToken;
 import com.yeshi.fanli.entity.common.ImageInfo;
 import com.yeshi.fanli.entity.goods.CommonGoods;
-import com.yeshi.fanli.entity.taobao.ScanHistory;
 import com.yeshi.fanli.entity.taobao.SearchFilter;
 import com.yeshi.fanli.entity.taobao.TaoBaoCoupon;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -693,7 +692,10 @@
 		tg.setBiz30day(tb.getBiz30day());
 		tg.setSalesCount(TaoBaoUtil.getSaleCount(tb.getBiz30day()));
 		tg.setTitle(tb.getTitle());
-		tg.setPictUrl(TbImgUtil.getTBSize320Img(tb.getPictUrl()));
+		if (!StringUtil.isNullOrEmpty(tb.getPictUrlWhite()))
+			tg.setPictUrl(TbImgUtil.getTBSize320Img(tb.getPictUrlWhite()));
+		else
+			tg.setPictUrl(TbImgUtil.getTBSize320Img(tb.getPictUrl()));
 		tg.setZkPrice(tb.getZkPrice());
 		tg.setAuctionUrl(tb.getAuctionUrl());
 		tg.setReservePrice(tb.getReservePrice());
@@ -1019,53 +1021,6 @@
 			return null;
 	}
 
-	public static TaoBaoGoodsBrief getTaoBaoGoodsBrief(ScanHistory sh) {
-		TaoBaoGoodsBrief tb = new TaoBaoGoodsBrief();
-		Field[] fields = tb.getClass().getDeclaredFields();
-		Field[] shFields = sh.getClass().getDeclaredFields();
-		for (int i = 0; i < fields.length; i++) {
-			Field field = fields[i];
-			field.setAccessible(true);
-			try {
-				for (Field target : shFields) {
-					target.setAccessible(true);
-					if (target.getName().equalsIgnoreCase(field.getName())) {
-						field.set(tb, target.get(sh));
-						break;
-					}
-				}
-			} catch (IllegalArgumentException e) {
-				e.printStackTrace();
-			} catch (IllegalAccessException e) {
-				e.printStackTrace();
-			}
-		}
-		return tb;
-	}
-
-	public static ScanHistory getScanHistory(TaoBaoGoodsBrief tb) {
-		ScanHistory sh = new ScanHistory();
-		Field[] fields = tb.getClass().getDeclaredFields();
-		Field[] shFields = sh.getClass().getDeclaredFields();
-		for (int i = 0; i < fields.length; i++) {
-			Field field = fields[i];
-			field.setAccessible(true);
-			try {
-				for (Field target : shFields) {
-					target.setAccessible(true);
-					if (target.getName().equalsIgnoreCase(field.getName())) {
-						target.set(sh, field.get(tb));
-						break;
-					}
-				}
-			} catch (IllegalArgumentException e) {
-			} catch (IllegalAccessException e) {
-			}
-		}
-
-		return sh;
-	}
-
 	public static List<String> getSuguestSearch(String key) {
 		try {
 			String url = String.format("https://suggest.taobao.com/sug?code=utf-8&q=%s&_=1486720576511",
@@ -1355,7 +1310,10 @@
 	 * @return
 	 */
 	public static String getGoodsHongBaoInfo(TaoBaoGoodsBrief goodsBrief, BigDecimal rate) {
-		return "楼" + getGoodsHongBaoMoney(goodsBrief, rate).toString();
+		if (goodsBrief != null && goodsBrief.getMaterialLibType() != null && goodsBrief.getMaterialLibType() == 0)
+			return "楼0.00";
+		else
+			return "楼"+getGoodsHongBaoMoney(goodsBrief, rate).toString();
 	}
 
 	/**
@@ -1757,12 +1715,17 @@
 			TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
 			goods.setAuctionId(item.optLong("itemId"));
 			goods.setTitle(item.optString("title"));
-			if (item.optJSONArray("images") != null && item.optJSONArray("images").size() > 0)
-			{
-				String picture=item.optJSONArray("images").optString(0);
-				goods.setPictUrl(picture.startsWith("http")?picture:"https:"+picture);
+			if (item.optJSONArray("images") != null && item.optJSONArray("images").size() > 0) {
+				String picture = item.optJSONArray("images").optString(0);
+				goods.setPictUrl(picture.startsWith("http") ? picture : "https:" + picture);
 			}
-				goods.setSellerId(seller.optLong("shopId"));
+			goods.setSellerId(seller.optLong("shopId"));
+			String shopType = seller.optString("shopType");
+			if ("B".equalsIgnoreCase(shopType)) {
+				goods.setUserType(1);
+			} else
+				goods.setUserType(0);
+
 			goods.setShopTitle(seller.optString("shopName"));
 			return goods;
 		}

--
Gitblit v1.8.0