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 | 449 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 273 insertions(+), 176 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 dbdaf48..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
@@ -6,6 +6,8 @@
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -24,8 +26,11 @@
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.bus.clazz.GoodsClass;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.jd.JDOrder;
+import com.yeshi.fanli.entity.jd.JDOrderItem;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
@@ -35,44 +40,20 @@
import net.sf.json.JSONObject;
public class JDApiUtil {
- public static String APP_ID = "1774659094";
- public static String APP_KEY = "7ba8e06b7d6fde3d6bd5db4b0026ecd7";
- public static String SECRET_KEY = "fb49bc6ecac5458ba5394fc2969d7c56";
+ public static String APP_ID = "1864778416";
+ public static String APP_KEY = "388f5133d13a5ea290aa5c44f3ebcc00";
+ public static String SECRET_KEY = "e22367fc866746d98b50d47b4c521781";
private static String SERVER_URL = "https://router.jd.com/api";
- public static Long POSITION_FANLI = 1834339426L;
- public static Long POSITION_SHARE = 1834289924L;
+ public static long POSITION_FANLI = 1869704794L;
+ public static long POSITION_SHARE = 1869542990L;
+ public static long POSITION_COUPON = 1869704796L;
// 璁㈠崟鏌ヨ绫诲瀷
public static int ORDER_TYPE_CREATETIME = 1;// 涓嬪崟鏃堕棿
public static int ORDER_TYPE_FINISHTIME = 2;// 瀹屾垚鏃堕棿
public static int ORDER_TYPE_UPDATETIME = 3;// 鏇存柊鏃堕棿
- private static String post(String url, Map<String, String> params) {
- String baseUrl = url;
- List<String> paramsList = new ArrayList<>();
- if (params != null)
- for (Iterator<String> its = params.keySet().iterator(); its.hasNext();) {
- String key = its.next();
- try {
- paramsList.add(key + "=" + URLEncoder.encode(params.get(key), "UTF-8"));
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
- }
- baseUrl += "?" + StringUtil.concat(paramsList, "&");
- HttpClient client = new HttpClient();
- PostMethod pm = new PostMethod(baseUrl);
- try {
- client.executeMethod(pm);
- String result = pm.getResponseBodyAsString();
- return new String(result.getBytes("ISO-8859-1"), "UTF-8");
- } catch (Exception e) {
- e.printStackTrace();
- }
- return null;
- }
-
private static String post2(String url, Map<String, String> params) {
String baseUrl = url;
List<String> paramsList = new ArrayList<>();
@@ -113,23 +94,6 @@
return StringUtil.Md5(SECRET_KEY + str + SECRET_KEY).toUpperCase();
}
- private static String baseRequest(String method, String accessToken, JSONObject params) {
- Map<String, String> baseMap = new HashMap<String, String>();
- baseMap.put("param_json", params.toString());
- baseMap.put("app_key", APP_KEY);
- baseMap.put("method", method);
- if (accessToken != null)
- baseMap.put("access_token", accessToken);
- baseMap.put("timestamp", TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd HH:mm:ss"));
- baseMap.put("format", "json");
- baseMap.put("v", "1.0");
- baseMap.put("sign_method", "md5");
- baseMap.put("sign", getSign(baseMap));
- String result = post(SERVER_URL, baseMap);
- return result;
- }
-
-
private static String baseRequest2(String method, String accessToken, JSONObject params) {
Map<String, String> baseMap = new HashMap<String, String>();
baseMap.put("param_json", params.toString());
@@ -145,35 +109,79 @@
String result = post2(SERVER_URL, baseMap);
return result;
}
-
+
/**
* 杞摼
*
* @return
*/
- public static String convertLink(String materialId, String couponUrl, String positionId, String ext1) {
+ public static String convertLink1(String materialId, String couponUrl, String positionId, String ext1) {
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(ext1))
- json.put("ext1", ext1);
+ json.put("ext1", ext1);
JSONObject root = new JSONObject();
root.put("promotionCodeReq", json);
- String result = baseRequest("jd.union.open.promotion.common.get", null, root);
+ String result = baseRequest2("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");
+ System.out.println(result);
+ if (result == null) {
+ return null;
+ }
+
resultJson = JSONObject.fromObject(result);
return resultJson.optJSONObject("data").optString("clickURL");
}
-
-
+
+ public static String convertLinkWithSubUnionId(String materialId, String couponUrl, String positionId,
+ String subUnionId) {
+ 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(subUnionId))
+ json.put("subUnionId", subUnionId);
+
+ // 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);
+
+ 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);
+ }
+
+ return null;
+ }
+
public static JDGoods queryGoodsDetail(Long skuId) {
List<Long> skuIdList = new ArrayList<>();
skuIdList.add(skuId);
@@ -189,15 +197,43 @@
}
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;
+ }
+
+ /**
+ * 閫氳繃鍟嗗搧鎼滅储鎺ュ彛鎵归噺鑾峰彇璇︽儏
+ *
+ * @param skuIds
+ * @return
+ */
+ public static List<JDGoods> listGoodsDetail(List<Long> skuIds) {
+ JDFilter filter = new JDFilter();
+ filter.setListId(skuIds);
+ JDSearchResult result = queryByKey(filter);
+ return result.getGoodsList();
+ }
+
/**
* 鍏抽敭璇嶅晢鍝佹煡璇㈡帴鍙ｃ�愮敵璇枫��
+ *
* @param skuIdList
* @return
*/
public static JDSearchResult queryByKey(JDFilter filter) {
JDSearchResult searchResult = new JDSearchResult();
-
+
List<JDGoods> list = new ArrayList<>();
JSONObject json = new JSONObject();
json.put("pageIndex", filter.getPageIndex());
@@ -256,16 +292,15 @@
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();
jsonDTO.put("goodsReqDTO", json);
-
-
+
String result = baseRequest2("jd.union.open.goods.query", null, jsonDTO);
System.out.println(result);
JSONObject resultJson = JSONObject.fromObject(result);
@@ -284,22 +319,51 @@
}
}
}
-
+
long totalCount = resultJson.optLong("totalCount");
PageEntity pageEntity = new PageEntity();
pageEntity.setTotalCount(totalCount);
-
+
searchResult.setPageEntity(pageEntity);
}
searchResult.setGoodsList(list);
return searchResult;
}
-
-
-
-
+
+ /**
+ * 瑙ｆ瀽浜笢鐨勫埜淇℃伅
+ *
+ * @param json
+ * @return
+ */
+ private static JDCouponInfo parseJDCouponInfo(JSONObject json) {
+ JDCouponInfo couponInfo = new Gson().fromJson(json.toString(), JDCouponInfo.class);
+ return couponInfo;
+ }
+
+ /**
+ * 瑙ｆ瀽浜笢鍟嗗搧淇℃伅
+ *
+ * @param json
+ * @return
+ */
+
private static JDGoods parseJDGoods(JSONObject json) {
JDGoods goods = new JDGoods();
+
+ // 浣ｉ噾淇℃伅
+ Object commission = json.get("commissionInfo");
+ JSONObject commissionJson = JSONObject.fromObject(commission);
+ BigDecimal commissionShare = new BigDecimal(commissionJson.optString("commissionShare"));
+ if (commissionShare.compareTo(new BigDecimal(0)) > 0) {
+ JDCommissionInfo commissionInfo = new JDCommissionInfo();
+ commissionInfo.setCommission(new BigDecimal(commissionJson.optString("commission")));
+ commissionInfo.setCommissionShare(commissionShare);
+ goods.setCommissionInfo(commissionInfo);
+ } else {
+ return null;
+ }
+
goods.setComments(json.optLong("comments"));
goods.setBrandCode(json.optString("brandCode"));
goods.setBrandName(json.optString("brandName"));
@@ -310,14 +374,12 @@
goods.setSkuId(json.optLong("skuId"));
goods.setSkuName(json.optString("skuName"));
goods.setIsHot(json.optInt("isHot"));
-
-
+
// 浠锋牸淇℃伅
Object priceInfo = json.get("priceInfo");
JSONObject priceInfoJson = JSONObject.fromObject(priceInfo);
- BigDecimal price = new BigDecimal(priceInfoJson.optString("price"));
- goods.setPrice(price);
-
+ goods.setPrice(new BigDecimal(priceInfoJson.optString("price")));
+
// 搴楅摵淇℃伅
Object shopInfo = json.get("shopInfo");
JSONObject shopInfoJson = JSONObject.fromObject(shopInfo);
@@ -325,8 +387,7 @@
jdshopInfo.setShopId(shopInfoJson.optInt("shopId"));
jdshopInfo.setShopName(shopInfoJson.optString("shopName"));
goods.setShopInfo(jdshopInfo);
-
-
+
// 鍒嗙被淇℃伅
Object category = json.get("categoryInfo");
JSONObject categoryJson = JSONObject.fromObject(category);
@@ -338,63 +399,7 @@
categoryInfo.setCid3(categoryJson.optLong("cid3"));
categoryInfo.setCid3Name(categoryJson.optString("cid3Name"));
goods.setCategoryInfo(categoryInfo);
-
-
- // 浣ｉ噾淇℃伅
- Object commission = json.get("commissionInfo");
- JSONObject commissionJson = JSONObject.fromObject(commission);
- JDCommissionInfo commissionInfo = new JDCommissionInfo();
- commissionInfo.setCommission(new BigDecimal(commissionJson.optString("commission")));
- commissionInfo.setCommissionShare(new BigDecimal(commissionJson.optString("commissionShare")));
- goods.setCommissionInfo(commissionInfo);
-
-
- // 鍒镐俊鎭�
- Object coupon = json.get("couponInfo");
- if (coupon != null) {
- JSONObject couponJson = JSONObject.fromObject(coupon);
- JSONArray couponArray = couponJson.optJSONArray("couponList");
- if (couponArray != null) {
- BigDecimal gap = null;
- JDCouponInfo couponInfo = null;
- for (int i = 0; i < couponArray.size(); i++) {
- boolean add = false;
- JSONObject jdcoupon = couponArray.optJSONObject(i);
- if (couponInfo == null) {
- couponInfo = new JDCouponInfo();
- add = true;
- }
-
- BigDecimal quota = new BigDecimal(jdcoupon.optString("quota"));
- BigDecimal sub = MoneyBigDecimalUtil.sub(price, quota);
- if (gap == null) {
- gap = sub;
- } else if (sub.compareTo(gap) == 0) {
- BigDecimal discount = new BigDecimal(jdcoupon.optString("discount"));
- if (discount.compareTo(couponInfo.getDiscount()) > 0) {
- add = true;
- }
- } else if (sub.compareTo(gap) > 0) {
- add = true;
- }
-
- if (add) {
- couponInfo.setBindType(jdcoupon.optInt("bindType"));
- couponInfo.setDiscount(new BigDecimal(jdcoupon.optString("discount")));
- couponInfo.setQuota(new BigDecimal(jdcoupon.optString("quota")));
- couponInfo.setPlatformType(jdcoupon.optInt("platformType"));
- couponInfo.setGetEndTime(jdcoupon.optLong("getEndTime"));
- couponInfo.setGetStartTime(jdcoupon.optLong("getStartTime"));
- couponInfo.setUseEndTime(jdcoupon.optLong("useEndTime"));
- couponInfo.setUseStartTime(jdcoupon.optLong("useStartTime"));
- couponInfo.setLink(jdcoupon.optString("link"));
- }
- }
- goods.setCouponInfo(couponInfo);
- }
- }
-
// 鍥剧墖淇℃伅
List<String> imageList = new ArrayList<String>();
Object images = json.get("imageInfo");
@@ -404,18 +409,20 @@
imageList.add(imagesArray.optJSONObject(i).optString("url"));
}
goods.setImageList(imageList);
-
+
if (imageList.size() > 0) {
goods.setPicUrl(imageList.get(0));
}
-
+
+ BigDecimal price = new BigDecimal(priceInfoJson.optString("price"));
// 鎷艰喘淇℃伅
Object pinGouInfo = json.get("pinGouInfo");
if (pinGouInfo != null) {
JSONObject pinGouInfoJson = JSONObject.fromObject(pinGouInfo);
if (!pinGouInfoJson.isEmpty()) {
JDPingouInfo jdPinGouInfo = new JDPingouInfo();
- jdPinGouInfo.setPingouPrice(new BigDecimal(pinGouInfoJson.optString("pingouPrice")));
+ price = new BigDecimal(pinGouInfoJson.optString("pingouPrice"));
+ jdPinGouInfo.setPingouPrice(price);
jdPinGouInfo.setPingouTmCount(pinGouInfoJson.optLong("pingouTmCount"));
jdPinGouInfo.setPingouUrl(pinGouInfoJson.optString("pingouUrl"));
jdPinGouInfo.setTotalCount(pinGouInfoJson.optLong("totalCount"));
@@ -424,13 +431,53 @@
goods.setPinGouInfo(jdPinGouInfo);
}
}
-
+
+ // 鍒镐俊鎭�
+ Object coupon = json.get("couponInfo");
+ if (coupon != null) {
+ JSONObject couponJson = JSONObject.fromObject(coupon);
+ JSONArray couponArray = couponJson.optJSONArray("couponList");
+ if (couponArray != null) {
+ List<JDCouponInfo> couponInfoList = new ArrayList<>();
+ for (int i = 0; i < couponArray.size(); i++) {
+ JDCouponInfo couponInfo = parseJDCouponInfo(couponArray.optJSONObject(i));
+ if (couponInfo != null)
+ couponInfoList.add(couponInfo);
+ }
+
+ // 鏍规嵁娑堣垂鏉′欢鎺掑簭
+ Comparator<JDCouponInfo> cm = new Comparator<JDCouponInfo>() {
+ @Override
+ public int compare(JDCouponInfo o1, JDCouponInfo o2) {
+ return o1.getQuota().compareTo(o2.getQuota());
+ }
+ };
+ Collections.sort(couponInfoList, cm);
+ // if (couponInfoList.size() > 0) {
+ // // 璁剧疆鍒镐俊鎭负鏈�鎺ヨ繎鐨勪竴涓�
+ // for (int i = couponInfoList.size() - 1; i >= 0; i--) {
+ // if
+ // (couponInfoList.get(i).getQuota().compareTo(goods.getPrice())
+ // <= 0) {
+ // goods.setCouponInfo(couponInfoList.get(i));
+ // break;
+ // }
+ // }
+ // if (goods.getCouponInfo() == null)
+ // goods.setCouponInfo(couponInfoList.get(0));
+ // }
+ //
+ goods.setCouponInfoList(couponInfoList);
+
+ }
+ }
+
return goods;
}
-
/**
* 鑾峰彇鎺ㄥ箍鍟嗗搧淇℃伅鎺ュ彛
+ *
* @param skuIdList
* @return
*/
@@ -438,13 +485,12 @@
List<JDGoods> list = new ArrayList<>();
JSONObject json = new JSONObject();
json.put("skuIds", StringUtil.concat(skuIdList, ","));
- String result = baseRequest("jd.union.open.goods.promotiongoodsinfo.query", null, json);
+ String result = baseRequest2("jd.union.open.goods.promotiongoodsinfo.query", null, json);
JSONObject resultJson = JSONObject.fromObject(result);
resultJson = resultJson.optJSONObject("jd_union_open_goods_promotiongoodsinfo_query_response");
if (resultJson.optInt("code") == 0) {
result = resultJson.optString("result");
resultJson = JSONObject.fromObject(result);
- System.out.println(resultJson);
JSONArray array = resultJson.optJSONArray("data");
if (array != null)
for (int i = 0; i < array.size(); i++) {
@@ -458,6 +504,19 @@
private static JDGoods parseSimpleJDGoods(JSONObject json) {
JDGoods goods = new JDGoods();
+ goods.setPrice(StringUtil.isNullOrEmpty(json.optString("wlUnitPrice"))
+ ? new BigDecimal(json.optString("unitPrice")) : new BigDecimal(json.optString("wlUnitPrice")));
+
+ BigDecimal commisionRatioWl = new BigDecimal(json.optString("commisionRatioWl"));
+ if (commisionRatioWl.compareTo(new BigDecimal(0)) > 0) {
+ JDCommissionInfo commissionInfo = new JDCommissionInfo();
+ commissionInfo.setCommissionShare(new BigDecimal(json.optString("commisionRatioWl")));
+ commissionInfo.setCommission(MoneyBigDecimalUtil
+ .div(goods.getPrice().multiply(commissionInfo.getCommissionShare()), new BigDecimal(100)));
+ goods.setCommissionInfo(commissionInfo);
+ } else {
+ return null;
+ }
JDCategoryInfo categoryInfo = new JDCategoryInfo();
categoryInfo.setCid1(json.optLong("cid1"));
@@ -469,22 +528,21 @@
goods.setCategoryInfo(categoryInfo);
goods.setComments(null);
- goods.setPrice(StringUtil.isNullOrEmpty(json.optString("wlUnitPrice"))
- ? new BigDecimal(json.optString("unitPrice")) : new BigDecimal(json.optString("wlUnitPrice")));
- JDCommissionInfo commissionInfo = new JDCommissionInfo();
- commissionInfo.setCommissionShare(new BigDecimal(json.optString("commisionRatioWl")));
- commissionInfo.setCommission(MoneyBigDecimalUtil
- .div(goods.getPrice().multiply(commissionInfo.getCommissionShare()), new BigDecimal(100)));
+ String isFreeShipping = json.optString("isFreeShipping");
+ if (!StringUtil.isNullOrEmpty(isFreeShipping)) {
+ goods.setIsFreeShipping(Integer.parseInt(isFreeShipping));
+ }
+ String inOrderCount = json.optString("inOrderCount");
+ if (!StringUtil.isNullOrEmpty(isFreeShipping)) {
+ goods.setInOrderCount30Days(Long.parseLong(inOrderCount));
+ }
- goods.setCommissionInfo(commissionInfo);
- goods.setCouponInfo(null);
goods.setGoodCommentsShare(null);
List<String> imageList = new ArrayList<>();
imageList.add(json.optString("imgUrl"));
goods.setPicUrl(json.optString("imgUrl"));
goods.setImageList(imageList);
- goods.setInOrderCount30Days(0L);
goods.setIsHot(null);
goods.setMaterialUrl(json.optString("materialUrl"));
goods.setOwner(null);
@@ -500,8 +558,7 @@
return goods;
}
-
-
+
public static JDSearchResult getJingFenGoods(int pageIndex, int eliteId) {
JDSearchResult searchResult = new JDSearchResult();
List<JDGoods> list = new ArrayList<>();
@@ -511,12 +568,12 @@
json.put("sortName", "inOrderCount30DaysSku");
json.put("sort", "desc");
json.put("eliteId", eliteId);
-
+
JSONObject jsonDTO = new JSONObject();
jsonDTO.put("goodsReq", json);
-
-
+
String result = baseRequest2("jd.union.open.goods.jingfen.query", null, jsonDTO);
+ LogHelper.test(result);
System.out.println(result);
JSONObject resultJson = JSONObject.fromObject(result);
resultJson = resultJson.optJSONObject("jd_union_open_goods_jingfen_query_response");
@@ -534,33 +591,31 @@
}
}
}
-
+
long totalCount = resultJson.optLong("totalCount");
PageEntity pageEntity = new PageEntity();
pageEntity.setTotalCount(totalCount);
-
+
searchResult.setPageEntity(pageEntity);
}
searchResult.setGoodsList(list);
return searchResult;
}
-
-
- public static JDSearchResult getGoodsClass() {
+
+ public static List<GoodsClass> getGoodsClass(int parentId, int grade) {
JDSearchResult searchResult = new JDSearchResult();
- List<JDGoods> list = new ArrayList<>();
+ List<GoodsClass> list = new ArrayList<>();
JSONObject json = new JSONObject();
- json.put("parentId", 0);
- json.put("grade", 0);
-
+ json.put("parentId", parentId);
+ json.put("grade", grade);
+
JSONObject jsonDTO = new JSONObject();
jsonDTO.put("req", json);
-
-
+
String result = baseRequest2("jd.union.open.category.goods.get", null, jsonDTO);
System.out.println(result);
JSONObject resultJson = JSONObject.fromObject(result);
- resultJson = resultJson.optJSONObject("jd_union_open_goods_jingfen_query_response");
+ resultJson = resultJson.optJSONObject("jd_union_open_category_goods_get_response");
if (resultJson.optInt("code") == 0) {
result = resultJson.optString("result");
resultJson = JSONObject.fromObject(result);
@@ -569,23 +624,22 @@
JSONArray array = resultJson.optJSONArray("data");
if (array != null) {
for (int i = 0; i < array.size(); i++) {
- JDGoods goods = parseJDGoods(array.optJSONObject(i));
- if (goods != null)
- list.add(goods);
+ GoodsClass gc = new GoodsClass();
+ JSONObject item = array.optJSONObject(i);
+ gc.setName(item.optString("name"));
+ gc.setId(item.optLong("id"));
+ list.add(gc);
}
}
}
-
+
long totalCount = resultJson.optLong("totalCount");
PageEntity pageEntity = new PageEntity();
pageEntity.setTotalCount(totalCount);
-
searchResult.setPageEntity(pageEntity);
}
- searchResult.setGoodsList(list);
- return searchResult;
+ return list;
}
-
public static JDGoods getGoodsDetail(Long skuId) {
List<Long> skuIdList = new ArrayList<>();
@@ -596,33 +650,66 @@
return null;
}
- public static JDOrderResult getOrder(int page, int pageSize, String time, int type) {
+ /**
+ * 鑾峰彇璁㈠崟鍒楄〃
+ *
+ * @param page
+ * @param pageSize
+ * @param time
+ * @param type
+ * 鏃堕棿绫诲瀷 1-涓嬪崟鏃堕棿 2-瀹屾垚鏃堕棿 3-鏇存柊鏃堕棿
+ * @return
+ */
+ public static JDOrderResult getOrderList(int page, int pageSize, Date time, int type) {
JSONObject json = new JSONObject();
JSONObject orderReq = new JSONObject();
orderReq.put("pageNo", page);
orderReq.put("pageSize", pageSize);
orderReq.put("type", type);
- orderReq.put("time", time);
+ orderReq.put("time", TimeUtil.getGernalTime(time.getTime(), "yyyyMMddHH"));
json.put("orderReq", orderReq);
- String result = baseRequest("jd.union.open.order.query", null, json);
+ String result = baseRequest2("jd.union.open.order.query", null, json);
+ System.out.println(result);
JSONObject root = JSONObject.fromObject(result).optJSONObject("jd_union_open_order_query_response");
if (root.optInt("code") == 0) {
boolean hasMore = root.optBoolean("hasMore");
root = JSONObject.fromObject(root.optString("result"));
- if (root.optInt("code") == 200) {
+ if (root.optInt("code") == 200 && root.optJSONArray("data") != null) {
+
String date = root.optJSONArray("data").toString();
Type typeToken = new TypeToken<List<JDOrder>>() {
}.getType();
List<JDOrder> orderList = new Gson().fromJson(date, typeToken);
if (orderList != null)
for (JDOrder order : orderList) {
+ Map<Long, List<JDOrderItem>> map = new HashMap<>();
for (int i = 0; i < order.getOrderItemList().size(); i++) {
+ JDOrderItem orderItem = order.getOrderItemList().get(i);
+ if (map.get(orderItem.getSkuId()) == null)
+ map.put(orderItem.getSkuId(), new ArrayList<>());
+ map.get(orderItem.getSkuId()).add(orderItem);
+
order.getOrderItemList().get(i)
.setTradeId(order.getOrderId() + "-" + order.getOrderItemList().get(i).getSkuId());
order.getOrderItemList().get(i).setOrderId(order.getOrderId());
order.getOrderItemList().get(i).setOrderBy(i + 1);
}
+ // 鏌ヨ鍟嗗搧ID鐩稿悓鐨勫瓙璁㈠崟
+ for (Iterator<Long> its = map.keySet().iterator(); its.hasNext();) {
+ Long skuId = its.next();
+ if (map.get(skuId).size() > 1) {
+ int skuOrderBy = 1;
+ for (int i = 0; i < order.getOrderItemList().size(); i++) {
+ JDOrderItem orderItem = order.getOrderItemList().get(i);
+ if (orderItem.getSkuId().longValue() == skuId) {
+ order.getOrderItemList().get(i).setTradeId(order.getOrderId() + "-"
+ + order.getOrderItemList().get(i).getSkuId() + "-" + skuOrderBy++);
+ }
+ }
+ }
+ }
+
}
return new JDOrderResult(hasMore, orderList);
}
@@ -630,4 +717,14 @@
return null;
}
+ public static void test() {
+ JSONObject json = new JSONObject();
+ json.put("materialId", "https://item.jd.com/32376790478.html");
+ json.put("ext1", "437032");
+ JSONObject root = new JSONObject();
+ root.put("promotionCodeReq", json);
+ String result = baseRequest2("jd.union.open.promotion.bysubunionid.get", null, root);
+ System.out.println(result);
+ }
+
}
--
Gitblit v1.8.0