From fe879975a3e8a0a1aa280fb839e02d159bfbcff8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 18:04:38 +0800
Subject: [PATCH] 金币任务多次获取bug修改
---
fanli/src/main/java/com/yeshi/fanli/util/dataoke/DaTaoKeApiUtil.java | 137 +++++++++++++++++++++++++++++++--------------
1 files changed, 93 insertions(+), 44 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 34c0f13..0a75e85 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
@@ -1,7 +1,6 @@
package com.yeshi.fanli.util.dataoke;
import java.io.IOException;
-import java.lang.reflect.Type;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
@@ -21,8 +20,10 @@
import org.jsoup.select.Elements;
import org.yeshi.utils.HttpUtil;
+import com.google.gson.ExclusionStrategy;
+import com.google.gson.FieldAttributes;
import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
+import com.google.gson.GsonBuilder;
import com.yeshi.fanli.dto.dataoke.DaTaoKeApiResult;
import com.yeshi.fanli.dto.dataoke.DaTaoKeGoodsResult;
import com.yeshi.fanli.dto.taobao.TaoBaoShopDTO;
@@ -30,9 +31,9 @@
import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
-import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -62,7 +63,20 @@
final static String[] APP_SECRETS = new String[] { APP_KEY_SECRET, APP_KEY_SECRET_2 };
- static Gson gson = new Gson();
+ static Gson gson = null;
+ static {
+ gson = new GsonBuilder().setExclusionStrategies(new ExclusionStrategy() {
+ @Override
+ public boolean shouldSkipField(FieldAttributes f) {
+ return f.getName().equals("createTime");// 蹇界暐createTime鐨勮В鏋�
+ }
+
+ @Override
+ public boolean shouldSkipClass(Class<?> clazz) {
+ return false;
+ }
+ }).create();
+ }
private static String get(String url) {
HttpClient client = new HttpClient();
@@ -120,6 +134,14 @@
resultJson.optJSONObject("data").optString("update_time"), list);
}
+ public static DaTaoKeDetail getGoodsDetailV1(Long id) {
+ String url = String.format("http://api.dataoke.com/index.php?r=Port/index&type=total&appkey=%s&v=2&id=%s",
+ Math.random() > 0.5 ? API_KEY : API_KEY_2, id + "");
+ String result = request(url);
+ JSONObject resultJson = JSONObject.fromObject(result);
+ return gson.fromJson(resultJson.optJSONArray("result").optJSONObject(0).toString(), DaTaoKeDetail.class);
+ }
+
/**
* 鑾峰彇澶ф窐瀹㈠搧鐗屼紭閫� 鍝佺墝id
*
@@ -162,7 +184,16 @@
JSONObject data = JSONObject
.fromObject(els.get(i).html().replace("var brandData =", "").trim().split("};")[0] + "}");
- taoBaoShopDTO = convertTaoBaoShopDTO(data);
+ taoBaoShopDTO = new TaoBaoShopDTO();
+ JSONObject item = data.optJSONObject("act");
+ taoBaoShopDTO.setSellerId(item.optLong("seller_id"));
+ taoBaoShopDTO.setBrandId(item.optString("brand_id"));
+ taoBaoShopDTO.setBrandDes(item.optString("brand_des"));
+ taoBaoShopDTO.setUserType(0);
+
+ // 鍟嗗搧淇℃伅
+ taoBaoShopDTO = getDynamicShopGoods(brandId, taoBaoShopDTO);
+
break;
}
}
@@ -195,11 +226,7 @@
if (dataJson != null) {
JSONArray array = dataJson.optJSONArray("list");
if (array != null) {
- String data = array.toString();
- Type type = new TypeToken<List<DaTaoKeDetailV2>>() {
- }.getType();
-
- List<DaTaoKeDetailV2> list = gson.fromJson(data, type);
+ List<DaTaoKeDetailV2> list = parseDaTaoKeDetailV2List(array);
daTaoKeGoodsResult.setGoodsList(list);
}
daTaoKeGoodsResult.setPageId(dataJson.optString("pageId"));
@@ -239,11 +266,7 @@
if (dataJson != null) {
JSONArray array = dataJson.optJSONArray("list");
if (array != null) {
- String data = array.toString();
- Type type = new TypeToken<List<DaTaoKeDetailV2>>() {
- }.getType();
-
- List<DaTaoKeDetailV2> list = gson.fromJson(data, type);
+ List<DaTaoKeDetailV2> list = parseDaTaoKeDetailV2List(array);
daTaoKeGoodsResult.setGoodsList(list);
}
daTaoKeGoodsResult.setPageId(dataJson.optString("pageId"));
@@ -276,11 +299,8 @@
if (dataJson != null) {
JSONArray array = dataJson.optJSONArray("list");
if (array != null) {
- String data = array.toString();
- Type type = new TypeToken<List<DaTaoKeDetailV2>>() {
- }.getType();
- List<DaTaoKeDetailV2> list = gson.fromJson(data, type);
+ List<DaTaoKeDetailV2> list = parseDaTaoKeDetailV2List(array);
daTaoKeGoodsResult.setGoodsList(list);
}
daTaoKeGoodsResult.setPageId(dataJson.optString("pageId"));
@@ -312,11 +332,7 @@
if (dataJson != null) {
JSONArray array = dataJson.optJSONArray("list");
if (array != null) {
- String data = array.toString();
- Type type = new TypeToken<List<DaTaoKeDetailV2>>() {
- }.getType();
-
- List<DaTaoKeDetailV2> list = gson.fromJson(data, type);
+ List<DaTaoKeDetailV2> list = parseDaTaoKeDetailV2List(array);
daTaoKeGoodsResult.setGoodsList(list);
}
daTaoKeGoodsResult.setPageId(dataJson.optString("pageId"));
@@ -327,7 +343,6 @@
public static DaTaoKeDetailV2 getGoodsDetail(Long id) {
TaoKeAppInfo app = getRandomApp();
- DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult();
Map<String, String> params = new TreeMap<>();
params.put("version", "v1.0.0");
params.put("appKey", app.getAppKey());
@@ -338,7 +353,7 @@
JSONObject json = JSONObject.fromObject(result);
JSONObject dataJson = json.optJSONObject("data");
if (dataJson != null) {
- return gson.fromJson(dataJson.toString(), DaTaoKeDetailV2.class);
+ return parseDaTaoKeDetailV2(dataJson);
}
return null;
}
@@ -379,11 +394,7 @@
if (dataJson != null) {
JSONArray array = dataJson.optJSONArray("list");
if (array != null) {
- String data = array.toString();
- Type type = new TypeToken<List<DaTaoKeDetailV2>>() {
- }.getType();
-
- List<DaTaoKeDetailV2> list = gson.fromJson(data, type);
+ List<DaTaoKeDetailV2> list = parseDaTaoKeDetailV2List(array);
daTaoKeGoodsResult.setGoodsList(list);
}
daTaoKeGoodsResult.setPageId(dataJson.optString("pageId"));
@@ -409,21 +420,30 @@
return StringUtil.Md5(signStr).toUpperCase();
}
- public static TaoBaoShopDTO convertTaoBaoShopDTO(JSONObject data) {
- TaoBaoShopDTO taoBaoShopDTO = new TaoBaoShopDTO();
- JSONObject item = data.optJSONObject("act");
- taoBaoShopDTO.setSellerId(item.optLong("seller_id"));
- taoBaoShopDTO.setBrandId(item.optString("brand_id"));
- taoBaoShopDTO.setBrandDes(item.optString("brand_des"));
- int userType = 0;
+ /**
+ * 鑾峰彇搴楅摵涓嬪墠4涓晢鍝併�佸簵閾轰粙缁�
+ *
+ * @param brandId
+ * @return
+ */
+ public static TaoBaoShopDTO getDynamicShopGoods(String brandId, TaoBaoShopDTO taoBaoShopDTO) {
+ if (brandId == null) {
+ return taoBaoShopDTO;
+ }
+ int userType = 0;
List<TaoBaoGoodsBrief> listGoods = new ArrayList<TaoBaoGoodsBrief>();
- JSONArray arrayGoods = data.optJSONArray("goods");
+
+ String result = HttpUtil.get("http://www.dataoke.com/brandGoods?id=" + brandId + "&page=1");
+ JSONObject json = JSONObject.fromObject(result);
+ JSONArray arrayGoods = json.optJSONArray("goods");
+
for (int i = 0; i < arrayGoods.size(); i++) {
if (i >= 2) {
break;
}
JSONObject itemGoods = arrayGoods.optJSONObject(i);
+
TaoBaoGoodsBrief taoBaoGoods = new TaoBaoGoodsBrief();
taoBaoGoods.setAuctionId(itemGoods.optLong("goodsid"));
taoBaoGoods.setBiz30day(itemGoods.optInt("xiaoliang"));
@@ -448,14 +468,15 @@
userType = itemGoods.optInt("istmall");
}
- taoBaoShopDTO.setListGoods(listGoods);
taoBaoShopDTO.setUserType(userType);
+ taoBaoShopDTO.setListGoods(listGoods);
return taoBaoShopDTO;
}
public static int RANK_TYPE_TIME = 1;// 瀹炴椂
public static int RANK_TYPE_DAY = 2;// 鍏ㄥぉ姒�
public static int RANK_TYPE_HOT = 3;// 鐑帹姒�
+ public static int RANK_TYPE_REBUY = 4;// 澶嶈喘姒�
/**
* 鍚勫ぇ姒滃崟
@@ -463,16 +484,23 @@
* @param type
* @return
*/
- public static DaTaoKeGoodsResult getRankingList(int type) {
+ public static DaTaoKeGoodsResult getRankingList(int type, Integer cid) {
TaoKeAppInfo app = getRandomApp();
DaTaoKeGoodsResult daTaoKeGoodsResult = new DaTaoKeGoodsResult();
Map<String, String> params = new TreeMap<>();
params.put("version", "v1.0.0");
params.put("appKey", app.getAppKey());
params.put("rankType", type + "");
+ if (cid != null)
+ params.put("cid", cid + "");
params.put("sign", getSign(params, app.getAppSecret()));
- String result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-ranking-list", params, new HashMap<>());
- LogHelper.test("getRankingList:" + result);
+ // 鍋�2娆¤姹�
+ String result = null;
+ try {
+ result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-ranking-list", params, new HashMap<>());
+ } catch (Exception e) {
+ result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-ranking-list", params, new HashMap<>());
+ }
JSONObject json = JSONObject.fromObject(result);
if (json != null) {
JSONArray array = json.optJSONArray("data");
@@ -480,7 +508,7 @@
List<DaTaoKeDetailV2> list = new ArrayList<>();
for (int i = 0; i < array.size(); i++) {
JSONObject itemData = array.optJSONObject(i);
- DaTaoKeDetailV2 item = gson.fromJson(itemData.toString(), DaTaoKeDetailV2.class);
+ DaTaoKeDetailV2 item = parseDaTaoKeDetailV2(itemData);
item.setCouponConditions(itemData.optString("quanUsageCondition"));
item.setShopType(itemData.optInt("istmall"));
item.setOriginalPrice(new BigDecimal(itemData.optString("originPrice")));
@@ -493,6 +521,27 @@
}
+ private static List<DaTaoKeDetailV2> parseDaTaoKeDetailV2List(JSONArray array) {
+ List<DaTaoKeDetailV2> detailList = new ArrayList<>();
+ for (int i = 0; i < array.size(); i++) {
+ DaTaoKeDetailV2 detail = parseDaTaoKeDetailV2(array.optJSONObject(i));
+ detailList.add(detail);
+ }
+ return detailList;
+ }
+
+ private static DaTaoKeDetailV2 parseDaTaoKeDetailV2(JSONObject json) {
+ DaTaoKeDetailV2 detail = gson.fromJson(json.toString(), DaTaoKeDetailV2.class);
+ if (StringUtil.isNullOrEmpty(json.optString("createTime"))) {
+ detail.setCreateTime(
+ new Date(TimeUtil.convertToTimeTemp(json.optString("onSaleTime"), "yyyy-MM-dd HH:mm:ss")));
+ } else {
+ detail.setCreateTime(
+ new Date(TimeUtil.convertToTimeTemp(json.optString("createTime"), "yyyy-MM-dd HH:mm:ss")));
+ }
+ return detail;
+ }
+
class DaTaoKeResult {
Date updateTime;
List<DaTaoKeDetail> dataList;
--
Gitblit v1.8.0