From 554de444b87aab5f93cb1593a8095612cf9479a7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 09 六月 2020 17:34:30 +0800
Subject: [PATCH] 订单

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java |   40 +++++++++++++++++++++++++++++++++++++---
 1 files changed, 37 insertions(+), 3 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 5bbbb1d..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/")))) {
@@ -571,8 +585,7 @@
 		else
 			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
 	}
-	
-	
+
 	@RequestMapping(value = "getKouBeiLink")
 	public void getKouBeiLink(AcceptData acceptData, Long uid, String activityId, boolean share, boolean shareImg,
 			String callback, PrintWriter out) {
@@ -597,7 +610,7 @@
 
 			if (dto != null) {
 				if (share) {// 鐢熸垚鍙d护
-					String token = TaoKeApiUtil.getTKToken("http://", "鍙g",dto.getClick_url() );
+					String token = TaoKeApiUtil.getTKToken("http://", "鍙g", dto.getClick_url());
 					dto.setToken(TaoBaoUtil.filterTaoToken(token));
 				}
 				redisManager.cacheCommonString(key, JsonUtil.getSimpleGson().toJson(dto), 60 * 60);// 缂撳瓨1涓皬鏃�
@@ -659,7 +672,28 @@
 	public void userProtocolListen(AcceptData acceptData, Long uid, int type, PrintWriter out) {
 		LogHelper.userProtocolListen(String.format("%s#%s#%s", acceptData.getDevice(), uid, type));
 		out.print(JsonUtil.loadTrueResult(""));
+	}
 
+	/**
+	 * 鏄惁鏄剧ず骞垮憡
+	 * @Title: showAd
+	 * @Description: 
+	 * @param acceptData
+	 * @param uid
+	 * @param out 
+	 * void 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	@RequestMapping(value = "getShowAd")
+	public void showAd(AcceptData acceptData, Long uid, PrintWriter out) {
+		String value = configService.get(ConfigKeyEnum.showSplashAd.getKey());
+		JSONObject data = new JSONObject();
+		if ("0".equalsIgnoreCase(value.trim())) {
+			data.put("show", false);
+		} else {
+			data.put("show", true);
+		}
+		out.print(JsonUtil.loadTrueResult(data));
 	}
 
 }

--
Gitblit v1.8.0