From bd331a582851cffcce54316e677e23760de4f384 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 24 六月 2019 11:36:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java
index b3d33ab..2095b2f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java
@@ -154,6 +154,17 @@
return searchResult;
}
+ public static JDGoods getGoodsDetail(Long skuId) {
+ JDSearchFilter sf = new JDSearchFilter();
+ sf.setKey(skuId + "");
+ sf.setPageNo(1);
+ sf.setPageSize(20);
+ JDSearchResult result = searchByKey(sf);
+ if (result != null && result.getGoodsList() != null && result.getGoodsList().size() > 0)
+ return result.getGoodsList().get(0);
+ return null;
+ }
+
private static JDGoods parseGoods(String data) {
JDGoods goods = new JDGoods();
JSONObject json = JSONObject.fromObject(data);
@@ -174,7 +185,7 @@
goods.setOwner("g");
else
goods.setOwner("p");
- goods.setMaterialUrl("http://img14.360buyimg.com/n1/"+json.optString("materialUrl"));
+ goods.setMaterialUrl("http://img14.360buyimg.com/n1/" + json.optString("materialUrl"));
JDCommissionInfo commission = new JDCommissionInfo();
commission.setCommission(new BigDecimal(json.optString("wlCommission")));
commission.setCommissionShare(new BigDecimal(json.optString("wlCommissionRatio")));
--
Gitblit v1.8.0