From 4d51ffeaf4ed8ac00697fc80a1437319110aab8e Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 20 三月 2019 12:03:16 +0800
Subject: [PATCH] Merge branch 'div'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 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 f01aa7f..528ff69 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,37 @@
@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);
--
Gitblit v1.8.0