From dd6a31aae79b35ccf0e006704a4d9e1d950c57d6 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:55:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopApiUtil.java | 75 +++++++++++++++++++++++++++----------
1 files changed, 55 insertions(+), 20 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/vip/VipApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopApiUtil.java
similarity index 72%
rename from fanli/src/main/java/com/yeshi/fanli/util/vip/VipApiUtil.java
rename to fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopApiUtil.java
index 7d6ed49..dfbaa2a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/vip/VipApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopApiUtil.java
@@ -1,7 +1,8 @@
-package com.yeshi.fanli.util.vip;
+package com.yeshi.fanli.util.vipshop;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Type;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Collections;
@@ -17,8 +18,14 @@
import org.yeshi.utils.StringUtil;
import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.gson.reflect.TypeToken;
+import com.yeshi.fanli.dto.vip.VIPSearchFilter;
import com.yeshi.fanli.dto.vip.VIPSearchResult;
import com.yeshi.fanli.dto.vip.goods.VIPGoodsInfo;
+import com.yeshi.fanli.dto.vipshop.VipShopOrderQueryModel;
+import com.yeshi.fanli.dto.vipshop.VipShopQueryOrderResultDTO;
+import com.yeshi.fanli.entity.vipshop.VipShopOrder;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -29,7 +36,7 @@
* @author Administrator
*
*/
-public class VipApiUtil {
+public class VipShopApiUtil {
private final static String appKey = "f9e7f22f";
private final static String appSecret = "9B2291352497FAF42B2DF44BFCF62316";
@@ -113,14 +120,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 +171,21 @@
*
* @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);
+ JSONObject resultJSON = JSONObject.fromObject(result);
+ if (resultJSON.optInt("returnCode") == 0) {
+ return resultJSON.optJSONObject("result").optJSONArray("urlInfoList").optJSONObject(0).optString("url");
+ }
+ return null;
}
/**
@@ -202,20 +231,26 @@
return goodsList.get(0);
}
- public static void getOrderList() {
- JSONObject params = new JSONObject();
- // params.put("status", 1);
- params.put("orderTimeStart", System.currentTimeMillis() - 1000 * 60 * 60L);
- params.put("orderTimeEnd", System.currentTimeMillis());
- params.put("page", 1);
- // params.put("pageSize", );
- // params.put("updateTimeStart", );
- // params.put("updateTimeEnd", );
+ public static VipShopQueryOrderResultDTO getOrderList(VipShopOrderQueryModel query) {
+ JSONObject params = JSONObject.fromObject(new Gson().toJson(query));
params.put("requestId", UUID.randomUUID());
JSONObject root = new JSONObject();
root.put("queryModel", params);
String result = baseRequest("com.vip.adp.api.open.service.UnionOrderService", "orderList", root);
System.out.println(result);
+ JSONObject json = JSONObject.fromObject(result);
+ if (json.optInt("returnCode") == 0) {
+ JSONObject resultJson = json.optJSONObject("result");
+ int total = resultJson.optInt("total");
+ JSONArray array = JSONArray.fromObject(resultJson.optJSONArray("orderInfoList"));
+ if (array != null) {
+ Type type = new TypeToken<ArrayList<VipShopOrder>>() {
+ }.getType();
+ List<VipShopOrder> orderList = new Gson().fromJson(array.toString(), type);
+ return new VipShopQueryOrderResultDTO(orderList, total);
+ }
+ }
+ return null;
}
}
--
Gitblit v1.8.0