From 07c13064382007999e87abe81efe76c98a47dce8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 05 六月 2019 11:33:56 +0800
Subject: [PATCH] 修改部分bug
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
index 4af7380..9ed78f1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
@@ -14,6 +14,7 @@
import com.yeshi.fanli.entity.bus.homemodule.FloatAD;
import com.yeshi.fanli.entity.config.AppHomeFloatImg;
import com.yeshi.fanli.entity.taobao.ClientTBPid;
+import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.homemodule.FloatADService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
@@ -48,6 +49,9 @@
@Resource
private FloatADService floatADService;
+
+ @Resource
+ private JumpDetailV2Service jumpDetailV2Service;
/**
* 棣栭〉閰嶇疆淇℃伅
@@ -157,7 +161,8 @@
@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")|| url.contains("m.tb.cn"))) {
+ 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
data.put("goodsDetail", true);// 闇�瑕佹嫤鎴晢鍝佽鎯�
} else {
@@ -195,6 +200,9 @@
JSONObject data = new JSONObject();
data.put("serviceProtocolLink", serviceProtocol);
data.put("privacyProtocolLink", privacyProtocol);
+ // 璐墿杞﹁烦杞柟寮�(鍖呭惈jumpDetail涓巔arams)
+ JSONObject source = JSONObject.fromObject(configService.get("taobao_cart_jump_detail"));
+ data.put("taoBaoCart", source);
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult("鑾峰彇澶辫触"));
@@ -240,7 +248,17 @@
@RequestMapping(value = "getOrderConfig", method = RequestMethod.POST)
public void getOrderConfig(AcceptData acceptData, PrintWriter out) {
JSONObject data = new JSONObject();
+ // 娴嬭瘯
data.put("showTaoBaoOrder", "0".equalsIgnoreCase(configService.get("show_taobao_order").trim()) ? false : true);
+ data.put("taoBaoOrderUrl", "https://main.m.taobao.com/olist/index.html");
out.print(JsonUtil.loadTrueResult(data));
}
+
+ @RequestMapping(value = "getKeFuConfig", method = RequestMethod.POST)
+ public void getKeFuConfig(AcceptData acceptData, PrintWriter out) {
+ JSONObject data = new JSONObject();
+ data.put("meiqia", "1".equalsIgnoreCase(configService.get("kefu_meiqia")) ? true : false);// 鏄惁璺宠浆缇庢唇锛屼笉璺宠浆缇庢唇灏辩敤鍘熸潵鐨�
+ out.print(JsonUtil.loadTrueResult(data));
+ }
+
}
--
Gitblit v1.8.0