From e74819e845de27735605c8116ee73768560e0fd9 Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期三, 03 六月 2020 15:17:15 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 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 706f1da..5cd11b7 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 @@ -51,8 +51,10 @@ import com.yeshi.fanli.util.ThreadUtil; import com.yeshi.fanli.util.VersionUtil; import com.yeshi.fanli.util.jd.JDUtil; +import com.yeshi.fanli.util.suning.SuningUtil; import com.yeshi.fanli.util.taobao.TaoBaoUtil; import com.yeshi.fanli.util.taobao.TaoKeApiUtil; +import com.yeshi.fanli.util.vipshop.VipShopUtil; import com.yeshi.fanli.vo.elme.ElemeConvertInfoResultVO; import com.yeshi.fanli.vo.homemodule.FloatImgDetailVO; @@ -344,6 +346,18 @@ data.put("baichuan", false);// 涓嶉渶瑕侀噰鐢ㄩ樋閲岀櫨宸濈殑鏂瑰紡鍔犺浇webview + } else if (url != null && (url.contains(".vip.com"))) {// 鍞搧浼� + String goodsId = VipShopUtil.parseGoodsIdByUrl(url); + if (StringUtil.isNullOrEmpty(goodsId))// 涓嶈兘鎷︽埅璇︽儏椤甸潰锛岄槻姝㈠墠绔繘鍏ユ寰幆 + data.put("goodsDetail", true); + else + data.put("goodsDetail", false); + } else if (url != null && (url.contains(".suning.com"))) {// 鑻忓畞 + String goodsId = SuningUtil.parseGoodsIdByUrl(url); + if (StringUtil.isNullOrEmpty(goodsId))// 涓嶈兘鎷︽埅璇︽儏椤甸潰锛岄槻姝㈠墠绔繘鍏ユ寰幆 + data.put("goodsDetail", true); + else + data.put("goodsDetail", false); } 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/")))) { -- Gitblit v1.8.0