From 81da61b828e29b7745e1382dfbbaeb685dc083ef Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 23 一月 2024 17:17:55 +0800
Subject: [PATCH] 抖音转链修改
---
fanli/src/main/java/com/yeshi/fanli/service/manger/ClipboardAnalysisManager.java | 100 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 74 insertions(+), 26 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/manger/ClipboardAnalysisManager.java b/fanli/src/main/java/com/yeshi/fanli/service/manger/ClipboardAnalysisManager.java
index eb4d12f..3601ab8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/manger/ClipboardAnalysisManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/manger/ClipboardAnalysisManager.java
@@ -11,7 +11,12 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.entity.taobao.SearchFilter;
+import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
import com.yeshi.fanli.util.*;
+import com.yeshi.fanli.util.goods.douyin.CSJCPSApiUtil;
+import com.yeshi.fanli.util.goods.douyin.DYUtil;
+import com.yeshi.fanli.util.goods.douyin.vo.DYGoodsDetail;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.goods.facade.utils.taobao.DaTaoKeApiUtil;
import org.jsoup.Jsoup;
@@ -165,19 +170,19 @@
//鏂扮増鍙ｄ护
String goodsId = null;
if (text.contains("https://m.tb.cn/")) {
- try {
- TaoKeApiUtil.TokenConvertResult result = TaoKeApiUtil.tokenConvert(text);
- if (result != null) {
- goodsId = result.getNum_iid();
- }
- } catch (TaoBaoTokenParseException e) {
- e.printStackTrace();
- }
- if (goodsId == null) {
- String auctionId = DaTaoKeApiUtil.parseTaoBaoToken(text);
- if (auctionId != null) {
- typeSet.add(ClipboardContentType.taoBaoToken);
- goodsId = auctionId;
+ String tempGoodsId = DaTaoKeApiUtil.parseGoodsIdFromToken(text);
+ if (tempGoodsId != null) {
+ goodsId = tempGoodsId;
+ typeSet.add(ClipboardContentType.taoBaoToken);
+ } else {
+ try {
+ TaoKeApiUtil.TokenConvertResult result = TaoKeApiUtil.tokenConvert(text);
+ if (result != null) {
+ goodsId = result.getNum_iid();
+ typeSet.add(ClipboardContentType.taoBaoToken);
+ }
+ } catch (TaoBaoTokenParseException e) {
+ e.printStackTrace();
}
}
}
@@ -198,12 +203,26 @@
}
//浼樺厛瑙ｆ瀽娣樺彛浠�
if (goodsId != null) {
- CommonGoods commonGoods = getTaoBaoGoods(goodsId);
- if (commonGoods != null)
- resultListener.onResult(commonGoods);
- else
- resultListener.onResult(text);
-
+ TaoBaoGoodsBrief taobaoGoods =null;
+ try {
+ taobaoGoods = TaoKeApiUtil.getSimpleGoodsInfo(goodsId);
+ } catch (TaobaoGoodsDownException e) {
+ e.printStackTrace();
+ }
+ if (taobaoGoods==null) {
+ int startIndex = text.indexOf("銆�");
+ int endIndex = text.indexOf("銆�");
+ if (startIndex > 0 && endIndex > 0) {
+ resultListener.onResult(text.substring(startIndex+1,endIndex));
+ return;
+ }
+ } else {
+ CommonGoods commonGoods = CommonGoodsFactory.create(taobaoGoods);
+ if (commonGoods != null)
+ resultListener.onResult(commonGoods);
+ else
+ resultListener.onResult(text);
+ }
return;
}
@@ -426,13 +445,23 @@
if (goods != null) {
commonGoods = CommonGoodsFactory.create(goods);
} else {
- goods = TaoBaoUtil.getTmallGoodsInfo(simpleGoods.getGoodsId());
- if (goods != null) {
+ SearchFilter sf=new SearchFilter();
+ sf.setKey("https://item.taobao.com/item.htm?id="+simpleGoods.getGoodsId());
+ TaoBaoSearchResult searchResult = TaoKeApiUtil.searchWuLiaoNew(sf,null,null);
+ if(searchResult!=null&&searchResult.getTaoBaoGoodsBriefs()!=null&&searchResult.getTaoBaoGoodsBriefs().size()>0){
+ TaoBaoGoodsBrief tempGoods = searchResult.getTaoBaoGoodsBriefs().get(0);
commonGoods = new CommonGoods();
- commonGoods.setTitle(goods.getTitle());
- commonGoods.setPicture(goods.getPictUrl());
- } else {
- // TODO 鏍规嵁娣樺疂鍟嗗搧ID瑙ｆ瀽鏍囬涓庡浘鐗�
+ commonGoods.setTitle(tempGoods.getTitle());
+ commonGoods.setPicture(tempGoods.getPictUrl());
+ }else {
+ goods = TaoBaoUtil.getTmallGoodsInfo(simpleGoods.getGoodsId());
+ if (goods != null) {
+ commonGoods = new CommonGoods();
+ commonGoods.setTitle(goods.getTitle());
+ commonGoods.setPicture(goods.getPictUrl());
+ } else {
+ // TODO 鏍规嵁娣樺疂鍟嗗搧ID瑙ｆ瀽鏍囬涓庡浘鐗�
+ }
}
}
@@ -480,6 +509,11 @@
if (goods != null) {
commonGoods = CommonGoodsFactory.create(goods);
}
+ } else if (simpleGoods.getGoodsType() == Constant.SOURCE_TYPE_DY) {
+ DYGoodsDetail goods = CSJCPSApiUtil.goodsDetail(Long.parseLong(simpleGoods.getGoodsId()));
+ if (goods != null) {
+ commonGoods = CommonGoodsFactory.create(goods);
+ }
}
return commonGoods;
@@ -515,6 +549,10 @@
if (!StringUtil.isNullOrEmpty(vipId)) {
return new SimpleCommonGoods(vipId, Constant.SOURCE_TYPE_VIP);
}
+ String dyProductId = DYUtil.parseProdectIdFromLink(link);
+ if (!StringUtil.isNullOrEmpty(dyProductId)) {
+ return new SimpleCommonGoods(dyProductId, Constant.SOURCE_TYPE_DY);
+ }
// 瑙ｆ瀽娣樺疂
String auctionId = parseTBAuctionIdFromLink(link);
@@ -541,7 +579,7 @@
}
// 棰嗗埜鐭繛鎺�
- if (StringUtil.isNullOrEmpty(jdId) && link.contains("u.jd.com")) {
+ if (StringUtil.isNullOrEmpty(jdId) && (link.contains("u.jd.com")||link.contains("//3.cn/"))) {
jdId = jdGoodsLinkParseManager.parseGoodsIdByJDShortUrl(link);
}
@@ -686,6 +724,14 @@
this.goodsType = goodsType;
}
}
+
+
+ public static void main(String[] args) {
+//String originText, String platform, String version
+
+ new ClipboardAnalysisManager(). parseJDSkuIdFromLink("https://3.cn/1-U6tjhC");
+
+ }
}
/**
@@ -693,3 +739,5 @@
*
* @author Administrator
*/
+
+
--
Gitblit v1.8.0