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/service/manger/ClipboardAnalysisManager.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 47c4f3b..9e451ae 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
@@ -205,7 +205,6 @@
link = urlList.get(0);
else// 绗竴涓彛浠ゅ湪绗竴涓摼鎺ュ墠闈�
token = tokenList.get(0);
-
} else if (typeSet.contains(ClipboardContentType.link) && typeSet.contains(ClipboardContentType.text)) {// 閾炬帴+鏂囨湰
link = urlList.get(0);
@@ -216,7 +215,17 @@
if (!StringUtil.isNullOrEmpty(link)) {
CommonGoods goods = parseLink(urlList.get(0));
if (goods == null || goods.getGoodsId() == null) {
- if (urlList.size() > 1)
+ if (tokenList.size() == 0 && urlList.size() == 2
+ && urlList.get(0).indexOf("://uland.taobao.com") > -1
+ && urlList.get(1).indexOf("?id=") > -1) {// 鏈�2涓摼鎺ョ殑鏂囨,绗竴涓槸搴楅摵鍒搁摼鎺ワ紝鍏朵腑浜屼釜鏄窐瀹濆晢鍝佽鎯�
+ CommonGoods goods1 = parseLink(urlList.get(1));
+ if (goods1 != null && goods1.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
+ resultListener.onResult(goods1);
+ } else {
+ resultListener.onResult(new GoodsDocParseResultVO(text, urlList.get(0)));
+ }
+
+ } else if (urlList.size() > 1)
resultListener.onResult(new GoodsDocParseResultVO(text, urlList.get(0)));
else {// 鍗曢摼鎺�
// 鍒ゆ柇鏄惁鍖呭惈鍙浆閾剧殑閾炬帴
@@ -469,7 +478,7 @@
tb = TaoBaoUtil.parsePhoneShareUrlByTM(link);
if (tb != null)
auctionId = tb.getAuctionId() + "";
- } else if (link.contains("h5.m.taobao") || link.contains("detail.m.tmall")|| link.contains("item.taobao")
+ } else if (link.contains("h5.m.taobao") || link.contains("detail.m.tmall") || link.contains("item.taobao")
|| link.contains("detail.tmall")) { // 鎵嬫満椤甸潰鍜岀數鑴戦〉闈�
Map<String, String> map = Utils.parseURL(link);
String id = "";
--
Gitblit v1.8.0