From f617136cba7f851a32f6091d5adc3e80f0e224c2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 24 一月 2019 09:33:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
index 9ee1100..7838008 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
@@ -324,10 +324,11 @@
goods.setPayRate30(1);
if (item.optBoolean("free_shipment"))
- goods.setFreeShipment(1);
+ goods.setFreeShipment(1);
if ("1".equalsIgnoreCase(item.optString("material_lib_type")))
;
+
goodsList.add(goods);
}
}
@@ -891,10 +892,16 @@
private static TaoBaoGoodsBrief parseWuLiaoItem(JSONObject item) {
TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
goods.setPictUrl(item.optString("pict_url"));
+
+ if (!StringUtil.isNullOrEmpty(item.optString("white_image"))) {
+ goods.setPictUrlWhite(item.optString("white_image"));
+ }
+
goods.setAuctionId(item.optLong("num_iid"));
goods.setAuctionUrl("https:" + item.optString("url"));
goods.setBiz30day(item.optInt("volume"));
goods.setCouponInfo(item.optString("coupon_info"));
+
if (goods.getCouponInfo() != null)
goods.setCouponInfo(goods.getCouponInfo().replace(".00", ""));
@@ -1495,9 +1502,9 @@
map.put("relation_app", "common");
JSONObject resultJSON = null;
try {
- TaoKeAppInfo app = new TaoKeAppInfo();
+ TaoKeAppInfo app = new TaoKeAppInfo();
app.setAppKey(appKey);
- app.setAppSecret(appSecret);
+ app.setAppSecret(appSecret);
resultJSON = TaoKeBaseUtil.baseRequest(map, app);
} catch (TaoKeApiException e) {
e.printStackTrace();
--
Gitblit v1.8.0