From d46dea27b6ec3e0fb32ec7d137699e9fc7d609b0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 12 十二月 2019 14:18:11 +0800
Subject: [PATCH] 订单补贴消息修改
---
fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java | 77 +++++++++++++++++++++++++++++++++-----
1 files changed, 67 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java
index 13108bb..9bb2ac0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java
@@ -360,7 +360,7 @@
}
return null;
}
-
+
public static DaTaoKeDetailV2 getGoodsDetailByGoodsId(Long goodsId) {
TaoKeAppInfo app = getRandomApp();
Map<String, String> params = new TreeMap<>();
@@ -417,11 +417,11 @@
cids = cids.substring(0, cids.length() - 1);
if (!StringUtil.isNullOrEmpty(cids))
params.put("cids", cids);
-
+
if (StringUtil.isNullOrEmpty(key))
key = "";
params.put("keyWords", key);
-
+
if (sort != null)
params.put("sort", sort + "");
params.put("sign", getSign(params, app.getAppSecret()));
@@ -440,8 +440,7 @@
}
return daTaoKeGoodsResult;
}
-
-
+
public static DaTaoKeGoodsResult search(String key, List<Integer> cidList, BigDecimal priceLowerLimit,
BigDecimal priceUpperLimit, Integer couponPriceLowerLimit, int page, int pageSize, Integer sort) {
@@ -456,10 +455,10 @@
params.put("priceLowerLimit", priceLowerLimit + "");
if (priceUpperLimit != null)
params.put("priceUpperLimit", priceUpperLimit + "");
-
+
if (couponPriceLowerLimit != null)
params.put("couponPriceLowerLimit", couponPriceLowerLimit + "");
-
+
String cids = "";
if (cidList != null && cidList.size() > 0)
for (Integer cid : cidList) {
@@ -470,11 +469,11 @@
cids = cids.substring(0, cids.length() - 1);
if (!StringUtil.isNullOrEmpty(cids))
params.put("cids", cids);
-
+
if (StringUtil.isNullOrEmpty(key))
- key = "";
+ key = "%";
params.put("keyWords", key);
-
+
if (sort != null)
params.put("sort", sort + "");
params.put("sign", getSign(params, app.getAppSecret()));
@@ -494,6 +493,64 @@
return daTaoKeGoodsResult;
}
+ /**
+ * 鍟嗗搧鍒楄〃
+ *
+ * @param key
+ * @param cidList
+ * @param priceLowerLimit
+ * @param priceUpperLimit
+ * @param couponPriceLowerLimit
+ * @param pageId
+ * @param pageSize
+ * @param sort
+ * @return
+ */
+ public static DaTaoKeGoodsResult getGoodsList(String key, List<Integer> cidList, BigDecimal priceLowerLimit,
+ BigDecimal priceUpperLimit, Integer couponPriceLowerLimit, int pageId, int pageSize, Integer sort) {
+ TaoKeAppInfo app = getRandomApp();
+ DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult();
+ Map<String, String> params = new TreeMap<>();
+ params.put("version", "v1.1.0");
+ params.put("appKey", app.getAppKey());
+ params.put("pageSize", pageSize + "");
+ params.put("pageId", pageId + "");
+
+ if (priceLowerLimit != null)
+ params.put("priceLowerLimit", priceLowerLimit + "");
+ if (priceUpperLimit != null)
+ params.put("priceUpperLimit", priceUpperLimit + "");
+
+ if (couponPriceLowerLimit != null)
+ params.put("couponPriceLowerLimit", couponPriceLowerLimit + "");
+
+ if (sort != null)
+ params.put("sort", sort + "");
+
+ if (cidList != null && cidList.size() > 0) {
+ String cids = "";
+ for (int cid : cidList)
+ cids += cid + ",";
+ cids = cids.endsWith(",") ? cids.substring(0, cids.length() - 1) : cids;
+
+ params.put("cids", cids + "");
+ }
+
+ params.put("sign", getSign(params, app.getAppSecret()));
+ String result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-goods-list", params, new HashMap<>());
+ JSONObject json = JSONObject.fromObject(result);
+ JSONObject dataJson = json.optJSONObject("data");
+ if (dataJson != null) {
+ JSONArray array = dataJson.optJSONArray("list");
+ if (array != null) {
+ List<DaTaoKeDetailV2> list = parseDaTaoKeDetailV2List(array);
+ daTaoKeGoodsResult.setGoodsList(list);
+ }
+ daTaoKeGoodsResult.setPageId(dataJson.optString("pageId"));
+ daTaoKeGoodsResult.setTotalCount(dataJson.optLong("totalNum"));
+ }
+ return daTaoKeGoodsResult;
+ }
private static String getSign(Map<String, String> map, String secretKey) {
if (map.size() == 0) {
--
Gitblit v1.8.0