From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求

---
 fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java
index 269f84c..7f7aef1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java
@@ -15,6 +15,8 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.script.Invocable;
 import javax.script.ScriptEngine;
@@ -636,7 +638,7 @@
 	 * @return
 	 */
 	public static String getJDGoodsIdByWeiXin(String url) {
-		if (StringUtil.isNullOrEmpty(url))
+		if (StringUtil.isNullOrEmpty(url) || url.indexOf("jd.com") < 0)
 			return null;
 
 		try {
@@ -727,6 +729,10 @@
 							if (NumberUtil.isNumeric(value) && value.length() >= 4) {
 								return value;
 							}
+						}
+						String id = JDUtil.getJDGoodsId(realLink);
+						if (!StringUtil.isNullOrEmpty(id)) {
+							return id;
 						}
 						LogHelper.error("浜笢鐭帴瑙f瀽澶辫触:" + url);
 						return null;
@@ -930,4 +936,15 @@
 		return getShowCouponInfo(goods.getCouponInfoList(), price);
 	}
 
+	public static List<String> getJDShortLinksFromText(String text) {
+		String regex = "(https://u\\.jd\\.com/)[0-9A-Za-z]{1,20}";
+		Pattern pattern = Pattern.compile(regex);
+		Matcher m = pattern.matcher(text);
+		List<String> urlList = new ArrayList<>();
+		while (m.find()) {
+			urlList.add(m.group());
+		}
+		return urlList;
+	}
+
 }

--
Gitblit v1.8.0