From 73a3d86a47d8da711b609cd224c63526f7d00f9b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 22 七月 2020 12:49:06 +0800
Subject: [PATCH] 比价相关的bug修复

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 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 7cf34d9..041d969 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
@@ -179,7 +179,7 @@
         urlMap.put(13, TEHUI_URL);
     }
 
-    public static TaoBaoSearchResult search(SearchFilter filter, boolean proxy) {
+    public static TaoBaoSearchResult search(SearchFilter filter, boolean proxy,String specialId,String relationId) {
         if (filter.getKey().startsWith("http://") || filter.getKey().startsWith("https://")) {
             String[] sts = filter.getKey().split("\\?")[1].split("&");
             for (String st : sts) {
@@ -211,7 +211,7 @@
             for (String c : filter.getCateIds().split(","))
                 cateList.add(Long.parseLong(c));
         }
-        return TaoKeApiUtil.searchWuLiao(filter, null, null);
+        return TaoKeApiUtil.searchWuLiao(filter, specialId, relationId);
     }
 
     /**
@@ -459,8 +459,8 @@
         return presult;
     }
 
-    public static TaoBaoSearchResult search(SearchFilter filter) {
-        return search(filter, false);
+    public static TaoBaoSearchResult search(SearchFilter filter,String specialId,String relationId) {
+        return search(filter, false,specialId,relationId);
     }
 
     public static TaoBaoSearchResult search2(SearchFilter filter, TaoBaoUnionConfig config) {
@@ -2238,4 +2238,19 @@
         return url + "&relationId=" + relationId;
     }
 
+
+    //浠庡埜閾炬帴鑾峰彇鍒窱D
+
+    /**
+     * 浠庡埜閾炬帴涓幏鍙栧埜ID
+     * @param couponLink
+     * @return
+     */
+    public static String getActivityIdFromCouponLink(String couponLink) {
+        Map<String, String> params = HttpUtil.getPramsFromUrl(couponLink);
+        if (params != null && params.containsKey("activityId"))
+            return params.get("activityId");
+        return null;
+    }
+
 }

--
Gitblit v1.8.0