From d1b7fd85615a78a476650e5acfc8b165a5deb3aa Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 12 四月 2019 11:41:05 +0800
Subject: [PATCH] Merge branch 'div'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 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 af49d67..8d64a15 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
@@ -14,14 +14,11 @@
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;
+import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
@@ -47,8 +44,8 @@
private TaoBaoUnionConfigService taoBaoUnionConfigService;
@Resource
- private CommonOrderCountService commonOrderCountService;
-
+ private UserInfoExtraService userInfoExtraService;
+
@Resource
private FloatADService floatADService;
@@ -86,7 +83,8 @@
detail.put("showTime", floatAD.getShowMode());
detail.put("accountLogin", floatAD.isJumpNeedLogin());
- if (uid != null && !commonOrderCountService.hasRebateAndShareOrder(uid)) {
+ if (uid != null && userInfoExtraService.isNewUser(uid)) {
+ // 鏂扮敤鎴�
data.put("floatImgDetail", detail);
} else {
data.put("floatImgDetail", detail);
@@ -96,6 +94,12 @@
// 棰嗗埜甯姪閾炬帴,1.5.2鍚庣敓鏁�
String couponHelp = configService.get("taobao_coupon_help");
data.put("couponHelpUrl", couponHelp);
+
+ // 搴曢儴缃戦〉閾炬帴
+ String platform = acceptData.getPlatform();
+ if ("android".equalsIgnoreCase(platform)) {
+ data.put("htmlLink", configService.get("index_html_link_android"));
+ }
out.print(JsonUtil.loadTrueResult(data));
}
@@ -169,4 +173,21 @@
out.print(JsonUtil.loadTrueResult(data));
}
+ @RequestMapping(value = "getUserConfig", method = RequestMethod.POST)
+ public void getUserConfig(AcceptData acceptData, PrintWriter out) {
+ try {
+ // 鐢ㄦ埛鍗忚閾炬帴
+ String serviceProtocol = configService.get("service_protocol_link");
+ // 闅愮鏉℃閾炬帴
+ String privacyProtocol = configService.get("privacy_protocol_link");
+ JSONObject data = new JSONObject();
+ data.put("serviceProtocolLink", serviceProtocol);
+ data.put("privacyProtocolLink", privacyProtocol);
+ out.print(JsonUtil.loadTrueResult(data));
+ } catch (Exception e) {
+ out.print(JsonUtil.loadFalseResult("鑾峰彇澶辫触"));
+ e.printStackTrace();
+ }
+
+ }
}
--
Gitblit v1.8.0