From b9f8ef2c4737b6e6be4b12fc8f7bafb033bfcfe5 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期日, 22 九月 2019 16:47:33 +0800
Subject: [PATCH] 金币BUG修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
index 7272309..a6c2ac2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
@@ -33,6 +33,7 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.VersionUtil;
+import com.yeshi.fanli.util.jd.JDUtil;
import net.sf.json.JSONObject;
@@ -154,7 +155,7 @@
} else {// 鑰佷汉
data.put("userTimeType", 1);
}
- data.put("hotFuctionLink", configService.get("hot_function_url"));
+ data.put("hotFuctionLink",configService.getByVersion("hot_function_url", platform, Integer.parseInt(acceptData.getVersion())));
out.print(JsonUtil.loadTrueResult(data));
}
@@ -242,14 +243,36 @@
@RequestMapping(value = "getWebConfig", method = RequestMethod.POST)
public void getWebConfig(AcceptData acceptData, String url, PrintWriter out) {
JSONObject data = new JSONObject();
- if (url != null && (url.contains("s.click") || url.contains("taobao.com") || url.contains("tmall.com")
+
+ if (url != null && url.contains("ifeeds.tmall.com/article.html?")) {
+ if (VersionUtil.greaterThan_2_0(acceptData.getPlatform(), acceptData.getVersion()))
+ data.put("baichuan", false);
+ else
+ data.put("baichuan", true);
+ data.put("goodsDetail", false);
+ } else if (url != null && (url.contains("s.click") || url.contains("taobao.com") || url.contains("tmall.com")
|| url.contains("m.tb.cn"))) {
- data.put("baichuan", true);// 閲囩敤闃块噷鐧惧窛鐨勬柟寮忓姞杞絯ebview
+ if (VersionUtil.greaterThan_2_0(acceptData.getPlatform(), acceptData.getVersion()))
+ data.put("baichuan", false);
+ else
+ data.put("baichuan", true);
data.put("goodsDetail", true);// 闇�瑕佹嫤鎴晢鍝佽鎯�
} else if (url != null && (url.contains("jd.com"))) {
+ // 涓嶈兘鍖呭惈璇︽儏椤�
+ String skuId = JDUtil.parseJDSkuIdByUrl(url);
+ if (StringUtil.isNullOrEmpty(skuId))// 涓嶈兘鎷︽埅璇︽儏椤甸潰锛岄槻姝㈠墠绔繘鍏ユ寰幆
+ if (url.startsWith("https://union-click.jd.com/jdc?"))
+ data.put("goodsDetail", false);
+ else
+ data.put("goodsDetail", true);
+ else
+ data.put("goodsDetail", false);
+
data.put("baichuan", false);// 涓嶉渶瑕侀噰鐢ㄩ樋閲岀櫨宸濈殑鏂瑰紡鍔犺浇webview
- data.put("goodsDetail", true);// 涓嶉渶瑕佹嫤鎴晢鍝佽鎯�
- } else if (url != null && (url.contains("yangkeduo.com"))) {
+
+ } else if (url != null && ((url.contains("yangkeduo.com") && !url.contains("yangkeduo.com/goods.html?")
+ && !url.contains("yangkeduo.com/duo_coupon_landing.html?"))
+ || (url.startsWith("https://p.pinduoduo.com/")))) {
data.put("baichuan", false);// 涓嶉渶瑕侀噰鐢ㄩ樋閲岀櫨宸濈殑鏂瑰紡鍔犺浇webview
data.put("goodsDetail", true);// 涓嶉渶瑕佹嫤鎴晢鍝佽鎯�
} else {
--
Gitblit v1.8.0