From eb78e9183005efa02064956cc9ef2299dc2d2bdd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 15 八月 2019 16:01:58 +0800
Subject: [PATCH] Merge branch 'mater-1.6.0' into div

---
 fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 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 e7f417b..294a3b6 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
@@ -37,21 +37,19 @@
 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_COUPON = 1859510742L;
+	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 post2(String url, Map<String, String> params) {
 		String baseUrl = url;
@@ -172,6 +170,19 @@
 				return list.get(0);
 		}
 		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();
 	}
 
 	/**
@@ -610,8 +621,8 @@
 		if (root.optInt("code") == 0) {
 			boolean hasMore = root.optBoolean("hasMore");
 			root = JSONObject.fromObject(root.optString("result"));
-			if (root.optInt("code") == 200&&root.optJSONArray("data")!=null) {
-				
+			if (root.optInt("code") == 200 && root.optJSONArray("data") != null) {
+
 				String date = root.optJSONArray("data").toString();
 				Type typeToken = new TypeToken<List<JDOrder>>() {
 				}.getType();

--
Gitblit v1.8.0