From bb3bdeae38ee40dbdd802634b2d4549790b9aa92 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 12 四月 2019 11:39:06 +0800
Subject: [PATCH] 1.5.3 需求提交
---
fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 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 12ddcca..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
@@ -16,9 +16,9 @@
import com.yeshi.fanli.entity.taobao.ClientTBPid;
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;
@@ -44,8 +44,8 @@
private TaoBaoUnionConfigService taoBaoUnionConfigService;
@Resource
- private CommonOrderCountService commonOrderCountService;
-
+ private UserInfoExtraService userInfoExtraService;
+
@Resource
private FloatADService floatADService;
@@ -83,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);
@@ -172,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