From be16d59fa5dafed5d4029539ea9618a94aa32e19 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 三月 2019 14:48:10 +0800
Subject: [PATCH] 推送修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 108 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 c2602a8..28c2f04 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
@@ -7,11 +7,21 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.JsonUtil;
+import org.yeshi.utils.encrypt.DESUtil;
import com.yeshi.fanli.entity.accept.AcceptData;
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 org.yeshi.utils.JsonUtil;
+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;
@@ -28,6 +38,15 @@
@Resource
private ConfigService configService;
+ @Resource
+ private TBPidService tbPidService;
+
+ @Resource
+ private TaoBaoUnionConfigService taoBaoUnionConfigService;
+
+ @Resource
+ private CommonOrderCountService commonOrderCountService;
+
/**
* 棣栭〉閰嶇疆淇℃伅
*
@@ -35,11 +54,98 @@
* @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));
+ }
+
+ @RequestMapping(value = "getTaoBaoCartConfig", method = RequestMethod.POST)
+ public void getTaoBaoCartConfig(AcceptData acceptData, Long uid, PrintWriter out) {
+ if (uid == null || uid <= 0) {
+ out.print(JsonUtil.loadFalseResult("鐢ㄦ埛灏氭湭鐧诲綍"));
+ return;
+ }
+
+ 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);
+ }
+ } 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);
+ }
+ }
+
+ 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));
+ }
+
+ /**
+ * 鑾峰彇璐﹀彿缁戝畾涓殑閰嶇疆淇℃伅
+ *
+ * @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