From 073d2e0dd261bae87d8f26092988dc176c940eaa Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 26 二月 2019 19:01:29 +0800
Subject: [PATCH] 券相关的通知消息
---
fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 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 b839928..b55fc2a 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
@@ -19,6 +19,7 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.user.TBPidService;
+import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import net.sf.json.JSONObject;
@@ -51,11 +52,20 @@
@RequestMapping(value = "getHomeConfig", method = RequestMethod.POST)
public void getHomeConfig(AcceptData acceptData, PrintWriter out) {
AppHomeFloatImg appHomeFloatImg = configService.getAppHomeFloatImg();
- if ("ios".equalsIgnoreCase(acceptData.getPlatform()))
+ 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();
+ if (!StringUtil.isNullOrEmpty(notifyImg)) {
+ data.put("floatNotifyImg", notifyImg);
+ }
+ //
+ String config = configService.get("home_float_img_new");
+ if (!StringUtil.isNullOrEmpty(config)) {
+ data.put("floatImgDetail", config);
+ }
out.print(JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0