From 6d2dc50e035f68b1ddea4621e7fa7bf36c393080 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 21 五月 2020 17:41:47 +0800
Subject: [PATCH] 好单库入库

---
 fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopApiUtil.java |   37 ++++++++++++++++++++++++++++---------
 1 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopApiUtil.java
index 62c956b..d1874e7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopApiUtil.java
@@ -17,6 +17,7 @@
 import org.yeshi.utils.StringUtil;
 
 import com.google.gson.Gson;
+import com.yeshi.fanli.dto.vip.VIPSearchFilter;
 import com.yeshi.fanli.dto.vip.VIPSearchResult;
 import com.yeshi.fanli.dto.vip.goods.VIPGoodsInfo;
 
@@ -113,14 +114,31 @@
 		return null;
 	}
 
-	public static VIPSearchResult search() {
+	/**
+	 * 鎼滅储
+	 * @Title: search
+	 * @Description: 
+	 * @param searchFilter
+	 * @return 
+	 * VIPSearchResult 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public static VIPSearchResult search(VIPSearchFilter searchFilter) {
 		Map<String, String> taskParams = new HashMap<>();
-		taskParams.put("keyword", "澶瑰厠 鐢峰+ 甯﹀附");
-		taskParams.put("page", "1");
-		taskParams.put("pageSize", "20");
-		taskParams.put("requestId", UUID.randomUUID() + "");
-		// taskParams.put("priceStart", "");
-		// taskParams.put("priceEnd", "");
+		taskParams.put("keyword", searchFilter.getKeyword());
+		taskParams.put("page", searchFilter.getPage() + "");
+		taskParams.put("pageSize", searchFilter.getPageSize() + "");
+		taskParams.put("requestId", System.currentTimeMillis() + "_" + UUID.randomUUID());
+		if (searchFilter.getPriceStart() != null)
+			taskParams.put("priceStart", searchFilter.getPriceStart());
+
+		if (searchFilter.getPriceEnd() != null)
+			taskParams.put("priceEnd", searchFilter.getPriceEnd());
+		if (searchFilter.getOrder() != null)
+			taskParams.put("order", searchFilter.getOrder() + "");
+		if (searchFilter.getFieldName() != null)
+			taskParams.put("fieldName", searchFilter.getFieldName() + "");
+
 		JSONObject root = new JSONObject();
 		root.put("request", JSONObject.fromObject(taskParams));
 		String result = baseRequest("com.vip.adp.api.open.service.UnionGoodsService", "query", root);
@@ -147,16 +165,17 @@
 	 * 
 	 * @param goodsId
 	 */
-	public static void convertLink(String goodsId, String tag) {
+	public static String convertLink(String goodsId, String tag) {
 		JSONObject taskParams = new JSONObject();
 		JSONArray goodsIdArray = new JSONArray();
 		goodsIdArray.add(goodsId);
 		taskParams.put("goodsIdList", goodsIdArray);
 		taskParams.put("chanTag", tag);
-		taskParams.put("requestId", UUID.randomUUID() + "");
+		taskParams.put("requestId", System.currentTimeMillis() + "_" + UUID.randomUUID());
 		String result = baseRequest("com.vip.adp.api.open.service.UnionUrlService", "genByGoodsId",
 				JSONObject.fromObject(taskParams));
 		System.out.println(result);
+		return null;
 	}
 
 	/**

--
Gitblit v1.8.0