From 435bed78efa8ab34bbf456ef55eb586ccfc113f1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 三月 2019 16:45:41 +0800
Subject: [PATCH] 删除了部分残余代码

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java |   21 +++------------------
 1 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java
index df7027d..863c01d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java
@@ -90,25 +90,9 @@
 
 		ClientTBPid clientTBPid = null;
 		if ("ios".equalsIgnoreCase(acceptData.getPlatform())) {
-			TBPid tbPid = tbPidService.getTBPid(uid, PidUser.TYPE_FANLI_IOS);
-			if (tbPid == null)
-				clientTBPid = tbPidService.getIOSDefault();
-			else {
-				String siteId = tbPid.getPid().split("_")[2];
-				String adzoneId = tbPid.getPid().split("_")[3];
-				TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);
-				clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);
-			}
+			clientTBPid = tbPidService.getIOSDefault();
 		} else {
-			TBPid tbPid = tbPidService.getTBPid(uid, PidUser.TYPE_FANLI_ANDROID);
-			if (tbPid == null)
-				clientTBPid = tbPidService.getAndroidDefault();
-			else {
-				String siteId = tbPid.getPid().split("_")[2];
-				String adzoneId = tbPid.getPid().split("_")[3];
-				TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);
-				clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);
-			}
+			clientTBPid = tbPidService.getAndroidDefault();
 		}
 
 		String cartJS = configService.get("taobao_cart_js");
@@ -145,6 +129,7 @@
 			data.put("baichuan", false);// 涓嶉渶瑕侀噰鐢ㄩ樋閲岀櫨宸濈殑鏂瑰紡鍔犺浇webview
 			data.put("goodsDetail", false);// 涓嶉渶瑕佹嫤鎴晢鍝佽鎯�
 		}
+		out.print(JsonUtil.loadTrueResult(data));
 	}
 
 	/**

--
Gitblit v1.8.0