From a39422f2a8ce45dd6cf65701ed5f9e65391c46c1 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 23 七月 2019 11:03:35 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java | 44 +++++++++++++++++++++++++++++++-------------
1 files changed, 31 insertions(+), 13 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 768f339..01b0b1c 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
@@ -22,9 +22,11 @@
import com.yeshi.fanli.dto.jd.JDFilter;
import com.yeshi.fanli.dto.jd.JDOrderResult;
import com.yeshi.fanli.dto.jd.JDPingouInfo;
+import com.yeshi.fanli.dto.jd.JDSearchResult;
import com.yeshi.fanli.dto.jd.JDShopInfo;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.jd.JDOrder;
+import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
@@ -149,19 +151,22 @@
*
* @return
*/
- public static String convertLink(String materialId, String couponUrl, String pid) {
+ public static String convertLink(String materialId, String couponUrl, String positionId, String ext1) {
JSONObject json = new JSONObject();
json.put("materialId", materialId);
json.put("siteId", APP_ID);
- if (couponUrl != null)
+ json.put("positionId", positionId);
+
+ if (!StringUtil.isNullOrEmpty(couponUrl))
json.put("couponUrl", couponUrl);
- // json.put("ext1", "437032_12");
- json.put("pid", pid);
+
+ if (!StringUtil.isNullOrEmpty(ext1))
+ json.put("ext1", ext1);
JSONObject root = new JSONObject();
root.put("promotionCodeReq", json);
- String result = baseRequest("jd.union.open.promotion.common.get", null, json);
+ String result = baseRequest("jd.union.open.promotion.common.get", null, root);
JSONObject resultJson = JSONObject.fromObject(result);
result = resultJson.optJSONObject("jd_union_open_promotion_common_get_response").optString("result");
resultJson = JSONObject.fromObject(result);
@@ -176,9 +181,12 @@
filter.setPageIndex(1);
filter.setPageSize(20);
filter.setListId(skuIdList);
- List<JDGoods> list = queryByKey(filter);
- if (list != null && list.size() > 0)
- return list.get(0);
+ JDSearchResult searchResult = queryByKey(filter);
+ if (searchResult != null) {
+ List<JDGoods> list = searchResult.getGoodsList();
+ if (list != null && list.size() > 0)
+ return list.get(0);
+ }
return null;
}
@@ -187,7 +195,9 @@
* @param skuIdList
* @return
*/
- public static List<JDGoods> queryByKey(JDFilter filter) {
+ public static JDSearchResult queryByKey(JDFilter filter) {
+ JDSearchResult searchResult = new JDSearchResult();
+
List<JDGoods> list = new ArrayList<>();
JSONObject json = new JSONObject();
json.put("pageIndex", filter.getPageIndex());
@@ -232,9 +242,6 @@
if (filter.getIsPG() != null)
json.put("isPG", filter.getIsPG());
- if (filter.getIsCoupon() != null)
- json.put("isCoupon", filter.getIsCoupon());
-
if (filter.getPingouPriceStart() != null)
json.put("pingouPriceStart", filter.getPingouPriceStart());
@@ -249,6 +256,10 @@
if (filter.getShopId() != null)
json.put("shopId", filter.getShopId());
+
+ if (filter.getOwner() != null)
+ json.put("owner", filter.getOwner());
+
System.out.println(json.toString());
JSONObject jsonDTO = new JSONObject();
@@ -273,8 +284,15 @@
}
}
}
+
+ long totalCount = resultJson.optLong("totalCount");
+ PageEntity pageEntity = new PageEntity();
+ pageEntity.setTotalCount(totalCount);
+
+ searchResult.setPageEntity(pageEntity);
}
- return list;
+ searchResult.setGoodsList(list);
+ return searchResult;
}
--
Gitblit v1.8.0