From cdcbed9af813b2a02cdc01eefa24db8bec6b51a9 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 三月 2019 12:17:33 +0800
Subject: [PATCH] 主分类 + 子分类 DAO改造
---
fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java | 88 +++++++++++++++++++++++++++++--------------
1 files changed, 59 insertions(+), 29 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 1f820aa..af49d67 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
@@ -11,12 +11,14 @@
import org.yeshi.utils.encrypt.DESUtil;
import com.yeshi.fanli.entity.accept.AcceptData;
+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.entity.taobao.PidUser;
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.homemodule.FloatADService;
import com.yeshi.fanli.service.inter.order.CommonOrderCountService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.user.TBPidService;
@@ -46,7 +48,11 @@
@Resource
private CommonOrderCountService commonOrderCountService;
-
+
+ @Resource
+ private FloatADService floatADService;
+
+
/**
* 棣栭〉閰嶇疆淇℃伅
*
@@ -56,24 +62,41 @@
@RequestMapping(value = "getHomeConfig", method = RequestMethod.POST)
public void getHomeConfig(AcceptData acceptData, Long uid, PrintWriter out) {
AppHomeFloatImg appHomeFloatImg = configService.getAppHomeFloatImg();
- if ("ios".equalsIgnoreCase(acceptData.getPlatform()) && !Constant.IS_TEST)
+ if ("ios".equalsIgnoreCase(acceptData.getPlatform()) && !Constant.IS_TEST) {
appHomeFloatImg = null;
+ }
+
JSONObject data = new JSONObject();
- if (appHomeFloatImg != null)
+ if (appHomeFloatImg != null) {
data.put("floatImg", appHomeFloatImg);
+ }
+
String notifyImg = configService.getAppHomeFloatNotifyImg();
if (!StringUtil.isNullOrEmpty(notifyImg)) {
data.put("floatNotifyImg", notifyImg);
}
- //
- String config = configService.get("home_float_img_new");
- if (!StringUtil.isNullOrEmpty(config)) {
- if (uid != null) {
- if (!commonOrderCountService.hasRebateAndShareOrder(uid))
- data.put("floatImgDetail", config);
- } else
- data.put("floatImgDetail", config);
+
+ // 鎮诞澶у浘 1.5.2 -2019.3.20
+ FloatAD floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX);
+ if (floatAD != null) {
+ JSONObject detail = new JSONObject();
+ detail.put("img", floatAD.getPicture());
+ detail.put("jumpDetail", floatAD.getJumpDetail());
+ detail.put("params", floatAD.getParams());
+ detail.put("showTime", floatAD.getShowMode());
+ detail.put("accountLogin", floatAD.isJumpNeedLogin());
+
+ if (uid != null && !commonOrderCountService.hasRebateAndShareOrder(uid)) {
+ data.put("floatImgDetail", detail);
+ } else {
+ data.put("floatImgDetail", detail);
+ }
}
+
+ // 棰嗗埜甯姪閾炬帴,1.5.2鍚庣敓鏁�
+ String couponHelp = configService.get("taobao_coupon_help");
+ data.put("couponHelpUrl", couponHelp);
+
out.print(JsonUtil.loadTrueResult(data));
}
@@ -86,41 +109,48 @@
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");
+ 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