From bc9d4bf3fddcb3107f8509159a250f7a5a5f8ae5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 11 六月 2021 17:13:01 +0800
Subject: [PATCH] 特价bug修复

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java |   43 +++++++++++++++++++++++++++++++++++++------
 1 files changed, 37 insertions(+), 6 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 7ba0427..2dd4dcd 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
@@ -23,6 +23,7 @@
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import com.yeshi.fanli.entity.SystemEnum;
+import com.yeshi.fanli.util.*;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
 import org.apache.commons.httpclient.methods.GetMethod;
@@ -67,12 +68,7 @@
 import com.yeshi.fanli.service.inter.goods.TaoBaoLinkService;
 import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
 import com.yeshi.common.entity.PageEntity;
-import com.yeshi.fanli.util.AESUtil;
-import com.yeshi.fanli.util.Constant;
 import org.yeshi.utils.MoneyBigDecimalUtil;
-import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TaoBaoConstant;
-import com.yeshi.fanli.util.TaoBaoHttpUtil;
 import org.yeshi.utils.TimeUtil;
 import com.yeshi.common.vo.ClientTextStyleVO;
 
@@ -2234,9 +2230,15 @@
      * @return
      */
     public static String concatRelationId(String url, String relationId) {
+        if (StringUtil.isNullOrEmpty(url)) {
+            return url;
+        }
         if (StringUtil.isNullOrEmpty(relationId))
             return url;
-        return url + "&relationId=" + relationId;
+        if (!url.contains("&relationId="))
+            return url + "&relationId=" + relationId;
+        else
+            return url;
     }
 
 
@@ -2258,6 +2260,7 @@
 
     /**
      * 鑾峰彇娣樺疂鎺堟潈閾炬帴
+     *
      * @param uid
      * @param source
      * @return
@@ -2267,4 +2270,32 @@
                 "http://api.flqapp.com/fanli/client/v1/auth/callback/tb", uid, source);
     }
 
+
+    /**
+     * 鏄惁涓烘窐瀹濈郴鐨勯摼鎺�
+     *
+     * @param link
+     * @return
+     */
+    public static boolean isTaoBaoLink(String link) {
+        TaoBaoGoodsBrief tb = null;
+        String auctionId = null;
+        if (link.startsWith("https://a.m.taobao.com/i"))// 娣樺疂璐﹀彿鏈櫥褰曠姸鎬�
+        {
+            return true;
+        } else if (link.contains("ju.taobao.com") || link.contains(".juhuasuan.com")) {// 鑱氬垝绠�
+            return true;
+        } else if (link.contains("http://zmnxbc.com")) { // 鎵嬫満绔ぉ鐚獳PP鍒嗕韩
+            return true;
+        } else if (link.contains("h5.m.taobao") || link.contains("detail.m.tmall") || link.contains("item.taobao")
+                || link.contains("detail.tmall")) { // 鎵嬫満椤甸潰鍜岀數鑴戦〉闈�
+            return true;
+        } else if (link.contains("//s.click.taobao.com")) {
+            return true;
+        }
+
+        return false;
+
+    }
+
 }

--
Gitblit v1.8.0