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/taobao/TaoBaoUtil.java | 123 ++++++++++++++++++++++++----------------
1 files changed, 74 insertions(+), 49 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
index 8c5cdf9..6c819a4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
@@ -6,6 +6,7 @@
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -43,6 +44,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
+import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
import com.yeshi.fanli.entity.common.ImageInfo;
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.taobao.SearchFilter;
@@ -58,7 +60,6 @@
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
import com.yeshi.fanli.entity.taobao.TaoBaoShop;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
-import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
@@ -1021,7 +1022,7 @@
tg.setTaoBaoQuanInfo(quanInfo);
}
- BigDecimal proportion = taoBaoUtil.manageService.getFanLiRate();
+ BigDecimal proportion = taoBaoUtil.manageService.getFanLiRate(UserLevelEnum.daRen);
TaoBaoHongBaoInfo hongBaoInfo = new TaoBaoHongBaoInfo();
String tkMktStatus = tb.getTkMktStatus();
if ("1".equals(tkMktStatus)) {
@@ -1074,23 +1075,13 @@
return tg;
}
- public static TaoBaoGoodsBrief getTaoBaoGoodsBrief(String id) {
- Map<String, String> params = new HashMap<String, String>();
- params.put("q", String.format("http://item.taobao.com/item.htm?id=%s", id));
- params.put("_t", System.currentTimeMillis() + "");
- params.put("auctionTag", "");
- params.put("perPageSize", 40 + "");
- params.put("t", System.currentTimeMillis() + "");
- String result = TaoBaoHttpUtil.get(SEARCH_URL, params);
- result = result.replace("</span>", "").replace("<span class=H>", "");
- TaoBaoSearchResult presult = parseTaoBao(result);
- if (presult != null && presult.getTaoBaoGoodsBriefs().size() > 0) {
- // TaoBaoGoodsBrief taoBaoGoodsBrief =
- // presult.getTaoBaoGoodsBriefs().get(0);
-
- return presult.getTaoBaoGoodsBriefs().get(0);
- } else
- return null;
+ /**
+ * 鑾峰彇鏈弬涓庢帹骞跨殑娣樺疂鍟嗗搧璇︽儏 @Title: getTaoBaoGoodsBrief @Description: @param
+ * id @return TaoBaoGoodsBrief 鍖呭惈锛堟爣棰樹笌鍥剧墖锛� @throws
+ */
+ public static TaoBaoGoodsBrief getTaoBaoGoodsBriefNotInPub(Long id) {
+ TaoBaoGoodsBrief tb = TaoBaoUtil.getTmallGoodsInfo(id + "");
+ return tb;
}
public static List<String> getSuguestSearch(String key) {
@@ -1756,43 +1747,31 @@
return taoBaoGoods;
}
- public static TaoBaoGoodsBrief convert(DaTaoKeDetail detail) {
- TaoBaoGoodsBrief taoBaoGoods = new TaoBaoGoodsBrief();
- taoBaoGoods.setAuctionId(detail.getGoodsId());
- taoBaoGoods.setBiz30day(detail.getSalesNum());
- taoBaoGoods.setCouponAmount(detail.getQuanPrice());
- taoBaoGoods.setCouponInfo(String.format("婊�%s鍏冨噺%s鍏�", detail.getQuanCondition(),
- MoneyBigDecimalUtil.getWithNoZera(detail.getQuanPrice())));
- taoBaoGoods.setCouponLeftCount(detail.getQuanSurplus());
- taoBaoGoods.setCouponStartFee(new BigDecimal(detail.getQuanCondition()));
- if (detail.getQuanReceive() != null)
- taoBaoGoods.setCouponTotalCount(detail.getQuanSurplus() + detail.getQuanReceive());
- taoBaoGoods.setPictUrl(detail.getPic());
- taoBaoGoods.setPictUrlWhite(detail.getPic());
- taoBaoGoods.setSellerId(detail.getSellerId());
- taoBaoGoods.setShopTitle("");
- taoBaoGoods.setTitle(detail.getdTitle());
- taoBaoGoods.setUserType(detail.getIsTmall());
- taoBaoGoods.setZkPrice(detail.getOrgPrice());
- taoBaoGoods.setTkRate(detail.getCommission());
- taoBaoGoods.setTkCommFee(new BigDecimal("0"));
- taoBaoGoods.setState(0);
- return taoBaoGoods;
- }
-
public static TaoBaoGoodsBrief convert(DaTaoKeDetailV2 detail) {
TaoBaoGoodsBrief taoBaoGoods = new TaoBaoGoodsBrief();
taoBaoGoods.setAuctionId(detail.getGoodsId());
taoBaoGoods.setBiz30day(detail.getMonthSales());
+ // 鍒哥浉鍏宠浆鎹�
taoBaoGoods.setCouponAmount(detail.getCouponPrice());
- taoBaoGoods.setCouponInfo(String.format("婊�%s鍏冨噺%s鍏�", detail.getCouponConditions(),
+ taoBaoGoods.setCouponInfo(String.format("婊�%s鍏冨噺%s鍏�", detail.getOriginalPrice(),
MoneyBigDecimalUtil.getWithNoZera(detail.getCouponPrice())));
if (detail.getCouponTotalNum() != null && detail.getCouponReceiveNum() != null)
taoBaoGoods.setCouponLeftCount(detail.getCouponTotalNum() - detail.getCouponReceiveNum());
else
taoBaoGoods.setCouponLeftCount(0);
taoBaoGoods.setCouponStartFee(detail.getOriginalPrice());
+ try {
+ taoBaoGoods.setCouponStartFee(detail.getOriginalPrice());
+ } catch (Exception e) {
+ }
+
taoBaoGoods.setCouponTotalCount(detail.getCouponTotalNum());
+ taoBaoGoods.setCouponLink(detail.getCouponLink());
+ taoBaoGoods.setCouponEffectiveStartTime(TimeUtil.getGernalTime(
+ TimeUtil.convertToTimeTemp(detail.getCouponStartTime(), "yyyy-MM-dd HH:mm:ss"), "yyyy-MM-dd"));
+ taoBaoGoods.setCouponEffectiveEndTime(TimeUtil.getGernalTime(
+ TimeUtil.convertToTimeTemp(detail.getCouponEndTime(), "yyyy-MM-dd HH:mm:ss"), "yyyy-MM-dd"));
+
taoBaoGoods.setPictUrl(detail.getMainPic());
taoBaoGoods.setPictUrlWhite(detail.getMainPic());
if (taoBaoGoods.getPictUrl() != null && !taoBaoGoods.getPictUrl().startsWith("http"))
@@ -1863,8 +1842,7 @@
String result = null;
try {
- Connection.Response doc = Jsoup.connect(url).ignoreContentType(true)
- .timeout(1000*10)
+ Connection.Response doc = Jsoup.connect(url).ignoreContentType(true).timeout(1000 * 10)
.userAgent(
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 Edge/18.18362")
.header("Accept", "text/html, application/xhtml+xml, application/xml; q=0.9, */*; q=0.8")
@@ -2037,14 +2015,14 @@
if (elements.size() >= 0) {
for (int i = 0; i < elements.size(); i++) {
String content = elements.get(i).toString();
- if (content.contains("var _DATA_Mdskip")) {
+ if (content.contains("var _DATA_Detail")) {
content = content.replace("<script>", "");
content = content.replace("</script>", "");
if (content.contains("videoDetail")) {
- content += ";function getData(){ var json={title:_DATA_Mdskip.item.title,pictUrl:_DATA_Mdskip.item.videoDetail.videoThumbnailURL}; return JSON.stringify(json);}";
+ content += ";function getData(){ var json={title:_DATA_Detail.item.title,pictUrl:_DATA_Detail.item.images[0]}; return JSON.stringify(json);}";
} else {
- content += ";function getData(){ var json={title:_DATA_Mdskip.item.title,pictUrl:_DATA_Mdskip.item.videos[0].videoThumbnailURL}; return JSON.stringify(json);}";
+ content += ";function getData(){ var json={title:_DATA_Detail.item.title,pictUrl:_DATA_Detail.item.images[0]}; return JSON.stringify(json);}";
}
ScriptEngineManager manager = new ScriptEngineManager();
@@ -2059,6 +2037,9 @@
taoBaoGoodsBrief = new TaoBaoGoodsBrief();
taoBaoGoodsBrief.setTitle(title.toString());
taoBaoGoodsBrief.setPictUrl(pictUrl.toString());
+ if (!pictUrl.toString().startsWith("http")) {
+ taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize220Img("http:" + pictUrl.toString()));
+ }
}
break;
@@ -2153,4 +2134,48 @@
return false;
}
+ private final static String[] taoTokenSymbols = new String[] { "鈧�-鈧�", "楼-楼", "锟�-锟�", "鈧�-鈧�", "\\$-\\$", "鈧�-鈧�", "垄-垄",
+ "鈧�-鈧�" };
+
+ /**
+ * 浠庢枃鏈腑鎻愬彇娣樺彛浠� @Title: getTokenListFromText @Description: @param str @return
+ * List<String> 杩斿洖绫诲瀷 @throws
+ */
+ public static List<String> getTokenListFromText(String str) {
+ String[] marks = taoTokenSymbols;
+
+ return getTokenListFromText(str, Arrays.asList(marks));
+ }
+
+ /**
+ * 浠庢枃鏈腑鎻愬彇娣樺彛浠�(鎷彿鐨勫彛浠や篃绠�)
+ *
+ * @param str
+ * @return
+ */
+ public static List<String> getTokenListFromTextWithKuoHao(String str) {
+ String[] marks = taoTokenSymbols;
+ List<String> list = new ArrayList<>();
+ for (String st : marks)
+ list.add(st);
+ list.add("\\(-\\)");
+ list.add("锛�-锛�");
+ return getTokenListFromText(str, list);
+ }
+
+ public static List<String> getTokenListFromText(String str, List<String> markList) {
+ List<String> expressList = new ArrayList<>();
+ for (String st : markList) {
+ expressList.add(String.format("(%s{1}[A-Za-z0-9]{11,13}+%s{1})", st.split("-")[0], st.split("-")[1]));
+ }
+ String pattern = StringUtil.concat(expressList, "|");
+ Pattern r = Pattern.compile(pattern);
+ Matcher m = r.matcher(str);
+ List<String> urlList = new ArrayList<>();
+ while (m.find()) {
+ urlList.add(m.group());
+ }
+ return urlList;
+ }
+
}
--
Gitblit v1.8.0