From 3cf41feae65a864fc00d72fdd09a676372fc3b27 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 三月 2019 12:22:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 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 b55fc2a..f01aa7f 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
@@ -17,6 +17,7 @@
import com.yeshi.fanli.entity.taobao.TBPid;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
import com.yeshi.fanli.service.inter.config.ConfigService;
+import com.yeshi.fanli.service.inter.order.CommonOrderCountService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.user.TBPidService;
import com.yeshi.fanli.util.Constant;
@@ -43,6 +44,9 @@
@Resource
private TaoBaoUnionConfigService taoBaoUnionConfigService;
+ @Resource
+ private CommonOrderCountService commonOrderCountService;
+
/**
* 棣栭〉閰嶇疆淇℃伅
*
@@ -50,11 +54,11 @@
* @param out
*/
@RequestMapping(value = "getHomeConfig", method = RequestMethod.POST)
- public void getHomeConfig(AcceptData acceptData, PrintWriter out) {
+ public void getHomeConfig(AcceptData acceptData, Long uid, PrintWriter out) {
AppHomeFloatImg appHomeFloatImg = configService.getAppHomeFloatImg();
if ("ios".equalsIgnoreCase(acceptData.getPlatform()) && !Constant.IS_TEST)
appHomeFloatImg = null;
- JSONObject data =new JSONObject();
+ JSONObject data = new JSONObject();
if (appHomeFloatImg != null)
data.put("floatImg", appHomeFloatImg);
String notifyImg = configService.getAppHomeFloatNotifyImg();
@@ -64,8 +68,16 @@
//
String config = configService.get("home_float_img_new");
if (!StringUtil.isNullOrEmpty(config)) {
- data.put("floatImgDetail", config);
+ if (uid != null) {
+ if (!commonOrderCountService.hasRebateAndShareOrder(uid))
+ data.put("floatImgDetail", config);
+ } else
+ data.put("floatImgDetail", config);
}
+ // 棰嗗埜甯姪閾炬帴,1.5.2鍚庣敓鏁�
+ String couponHelp = configService.get("taobao_coupon_help");
+ data.put("couponHelpUrl", couponHelp);
+
out.print(JsonUtil.loadTrueResult(data));
}
@@ -100,19 +112,42 @@
}
String cartJS = configService.get("taobao_cart_js");
+ String cartUrl = configService.get("taobao_cart_link");
String js = null;
+ String link = null;
try {
js = DESUtil.encode(cartJS, StringUtil.getBase64String("YeShiFANLI889*+"),
StringUtil.getBase64String("*M#34f?,"));
} catch (Exception e) {
e.printStackTrace();
}
+
+ try {
+ link = DESUtil.encode(cartUrl, StringUtil.getBase64String("YeShiFANLI889*+"),
+ StringUtil.getBase64String("*M#34f?,"));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
JSONObject data = new JSONObject();
data.put("js", js);
+ data.put("link", link);
data.put("tbPidInfo", clientTBPid);
out.print(JsonUtil.loadTrueResult(data));
}
+ @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"))) {
+ data.put("baichuan", true);// 閲囩敤闃块噷鐧惧窛鐨勬柟寮忓姞杞絯ebview
+ data.put("goodsDetail", true);// 闇�瑕佹嫤鎴晢鍝佽鎯�
+ } else {
+ data.put("baichuan", false);// 涓嶉渶瑕侀噰鐢ㄩ樋閲岀櫨宸濈殑鏂瑰紡鍔犺浇webview
+ data.put("goodsDetail", false);// 涓嶉渶瑕佹嫤鎴晢鍝佽鎯�
+ }
+ out.print(JsonUtil.loadTrueResult(data));
+ }
+
/**
* 鑾峰彇璐﹀彿缁戝畾涓殑閰嶇疆淇℃伅
*
--
Gitblit v1.8.0