From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java | 62 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 20 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java
index 30d3735..84c79cb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java
@@ -145,33 +145,41 @@
public static String convertLinkWithSubUnionId(String materialId, String couponUrl, String positionId,
String subUnionId) {
- JSONObject json = new JSONObject();
- json.put("materialId", materialId);
- json.put("siteId", APP_ID);
- json.put("positionId", positionId);
+ String log = "浜笢杞摼鍑洪敊:";
+ try {
+ JSONObject json = new JSONObject();
+ json.put("materialId", materialId);
+ json.put("siteId", APP_ID);
+ json.put("positionId", positionId);
- if (!StringUtil.isNullOrEmpty(couponUrl))
- json.put("couponUrl", couponUrl);
+ if (!StringUtil.isNullOrEmpty(couponUrl))
+ json.put("couponUrl", couponUrl);
- if (!StringUtil.isNullOrEmpty(subUnionId))
- json.put("subUnionId", subUnionId);
+ if (!StringUtil.isNullOrEmpty(subUnionId))
+ json.put("subUnionId", subUnionId);
- // 1锛氶暱閾撅紝 2 锛氱煭閾� 锛�3锛� 闀块摼+鐭摼
- json.put("chainType", 3);
- JSONObject root = new JSONObject();
- root.put("promotionCodeReq", json);
+ // 1锛氶暱閾撅紝 2 锛氱煭閾� 锛�3锛� 闀块摼+鐭摼
+ json.put("chainType", 3);
+ JSONObject root = new JSONObject();
+ root.put("promotionCodeReq", json);
- String result = baseRequest2("jd.union.open.promotion.bysubunionid.get", null, root);
+ String result = baseRequest2("jd.union.open.promotion.bysubunionid.get", null, root);
- JSONObject resultJson = JSONObject.fromObject(result);
- result = resultJson.optJSONObject("jd_union_open_promotion_bysubunionid_get_response").optString("result");
- System.out.println(result);
- if (result == null) {
- return null;
+ log += json.toString() + "####" + result;
+ JSONObject resultJson = JSONObject.fromObject(result);
+ result = resultJson.optJSONObject("jd_union_open_promotion_bysubunionid_get_response").optString("result");
+ System.out.println(result);
+ if (result == null) {
+ return null;
+ }
+
+ resultJson = JSONObject.fromObject(result);
+ return resultJson.optJSONObject("data").optString("shortURL");
+ } catch (Exception e) {
+ LogHelper.error(log);
}
- resultJson = JSONObject.fromObject(result);
- return resultJson.optJSONObject("data").optString("shortURL");
+ return null;
}
public static JDGoods queryGoodsDetail(Long skuId) {
@@ -190,6 +198,20 @@
return null;
}
+ public static List<JDGoods> queryGoodsDetail(List<Long> skuIdList) {
+ JDFilter filter = new JDFilter();
+ filter.setPageIndex(1);
+ filter.setPageSize(20);
+ filter.setListId(skuIdList);
+ JDSearchResult searchResult = queryByKey(filter);
+ if (searchResult != null) {
+ List<JDGoods> list = searchResult.getGoodsList();
+ if (list != null && list.size() > 0)
+ return list;
+ }
+ return null;
+ }
+
/**
* 閫氳繃鍟嗗搧鎼滅储鎺ュ彛鎵归噺鑾峰彇璇︽儏
*
--
Gitblit v1.8.0