From 8ce7c720e4e7a604b0ff770349b5556f39d37759 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 九月 2021 11:44:38 +0800
Subject: [PATCH] 好省呗应用兼容
---
fanli/src/main/java/com/yeshi/fanli/service/manger/ClipboardAnalysisManager.java | 68 ++++++++++++++++++++++++++++++----
1 files changed, 60 insertions(+), 8 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 bdcc3a9..cbe1053 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,6 +11,8 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.util.*;
+import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.goods.facade.utils.taobao.DaTaoKeApiUtil;
import org.springframework.stereotype.Component;
import org.yeshi.utils.HttpUtil;
@@ -29,13 +31,6 @@
import com.yeshi.fanli.service.inter.user.TokenRecordService;
import com.yeshi.fanli.service.manger.goods.jd.JDGoodsLinkParseManager;
import com.yeshi.fanli.service.manger.goods.tb.TaoBaoTokenAuctionIdMapManager;
-import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.DouYinUtil;
-import com.yeshi.fanli.util.RedisManager;
-import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TokenUtil;
-import com.yeshi.fanli.util.Utils;
-import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.factory.CommonGoodsFactory;
import com.yeshi.fanli.util.jd.JDApiUtil;
import com.yeshi.fanli.util.jd.JDUtil;
@@ -115,7 +110,45 @@
typeSet.add(ClipboardContentType.text);
}
+
return typeSet;
+ }
+
+
+ /**
+ * 鐗逛环瑙ｆ瀽绮樿创鏉�
+ * 鏃犲钩鍙帮紝鏍规嵁鏍煎紡鍒ゆ柇骞冲彴
+ *
+ * @param text
+ */
+ public Integer tejiaParseSourceType(String text) {
+ if (text == null)
+ return null;
+ text = text.trim();
+ //鍒ゆ柇鏄惁鏈夐摼鎺�
+ List<String> linkList = HttpUtil.getUrlListFromText(text);
+ if (linkList != null && linkList.size() > 0) {
+ String link = linkList.get(0);
+ if (TaoBaoUtil.isTaoBaoLink(link)) {
+ return Constant.SOURCE_TYPE_TAOBAO;
+ } else if (JDUtil.isJDLink(link)) {
+ return Constant.SOURCE_TYPE_JD;
+ } else if (PinDuoDuoUtil.isPDDLink(link)) {
+ return Constant.SOURCE_TYPE_PDD;
+ } else if (VipShopUtil.isVIPShopLink(link)) {
+ return Constant.SOURCE_TYPE_VIP;
+ } else if (SuningUtil.isSuningLink(link)) {
+ return Constant.SOURCE_TYPE_SUNING;
+ }
+ //閾炬帴闈炵數鍟嗗钩鍙伴摼鎺�
+ return null;
+ }
+
+ //鍒ゆ柇鏄惁鐤戜技鍙ｄ护
+ if (TaoBaoUtil.isHaveNewVersionTaoBaoToken(text)) {
+ return Constant.SOURCE_TYPE_TAOBAO;
+ }
+ return null;
}
/**
@@ -128,6 +161,25 @@
text = text.trim();
Set<ClipboardContentType> typeSet = parseContentType(text, platform, version);
+ //鏂扮増鍙ｄ护
+ Long 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) {
+ Long auctionId = DaTaoKeApiUtil.parseTaoBaoToken(text);
+ if (auctionId != null) {
+ typeSet.add(ClipboardContentType.taoBaoToken);
+ goodsId = auctionId;
+ }
+ }
+ }
// 绯荤粺鍙ｄ护
if (typeSet.contains(ClipboardContentType.systemToken)) {
@@ -144,7 +196,6 @@
return;
}
//浼樺厛瑙ｆ瀽娣樺彛浠�
- Long goodsId = DaTaoKeApiUtil.parseTaoBaoToken(text);
if (goodsId != null) {
CommonGoods commonGoods = getTaoBaoGoods(goodsId);
if (commonGoods != null)
@@ -492,6 +543,7 @@
return jdId;
}
+
public String parseTBAuctionIdFromLink(String link) {
TaoBaoGoodsBrief tb = null;
String auctionId = null;
--
Gitblit v1.8.0