From 56e258fa6c23469ea825f6b11d458df9ba577e9f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 01 三月 2019 14:38:50 +0800
Subject: [PATCH] Merge branch 'div'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 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 ede3bef..1f820aa 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,8 +17,10 @@
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;
import com.yeshi.fanli.util.StringUtil;
import net.sf.json.JSONObject;
@@ -42,6 +44,9 @@
@Resource
private TaoBaoUnionConfigService taoBaoUnionConfigService;
+ @Resource
+ private CommonOrderCountService commonOrderCountService;
+
/**
* 棣栭〉閰嶇疆淇℃伅
*
@@ -49,11 +54,26 @@
* @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();
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);
+ }
out.print(JsonUtil.loadTrueResult(data));
}
@@ -90,7 +110,7 @@
String cartJS = configService.get("taobao_cart_js");
String js = null;
try {
- js = DESUtil.encode(cartJS, StringUtil.getBase64String("YeShiFANLI889*+"),
+ js = DESUtil.encode(cartJS, StringUtil.getBase64String("YeShiFANLI889*+"),
StringUtil.getBase64String("*M#34f?,"));
} catch (Exception e) {
e.printStackTrace();
@@ -101,4 +121,22 @@
out.print(JsonUtil.loadTrueResult(data));
}
+ /**
+ * 鑾峰彇璐﹀彿缁戝畾涓殑閰嶇疆淇℃伅
+ *
+ * @param acceptData
+ * @param uid
+ * @param out
+ */
+
+ @RequestMapping(value = "getBindAccountConfig", method = RequestMethod.POST)
+ public void getBindAccountConfig(AcceptData acceptData, PrintWriter out) {
+ String alipayHelpUrl = configService.get("alipay_help");// 鏀粯瀹濆府鍔�
+ String alipayBindFailUrl = configService.get("alipay_bind_fail_reason");// 鏀粯瀹濈粦瀹氬け璐ュ師鍥�
+ JSONObject data = new JSONObject();
+ data.put("alipayHelp", alipayHelpUrl);
+ data.put("alipayBindFailReason", alipayBindFailUrl);
+ out.print(JsonUtil.loadTrueResult(data));
+ }
+
}
--
Gitblit v1.8.0