From b6c37e4bc38db88a360d0f2c6099183f9bb75bdc Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 22 四月 2019 14:31:59 +0800
Subject: [PATCH] 券推送插入
---
fanli/src/main/java/com/yeshi/fanli/controller/client/ConfigController.java | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 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..4024031 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,42 @@
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();
+ }
+
+ }
+
+ /**
+ * 璁㈠崟瑙ｆ瀽閰嶇疆
+ * @param acceptData
+ * @param out
+ */
+ @RequestMapping(value = "getOrderParseConfig", method = RequestMethod.POST)
+ public void getOrderParseConfig(AcceptData acceptData, PrintWriter out) {
+ String orderJS = "var orderId= document.getElementById('tp-bought-root').getElementsByClassName('js-order-container')[0].getElementsByTagName('div')[0].getAttribute('data-id');";
+ orderJS += "if(/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {window.location.href='yestv://taobaoorder#'+orderId;} else {window.handle.showOrder(orderId)}";
+ JSONObject data = new JSONObject();
+ try {
+ data.put("orderJS", DESUtil.encode(orderJS, StringUtil.getBase64String("YeShiFANLI889*+"),
+ StringUtil.getBase64String("*M#34f?,")));
+ data.put("orderUrl", DESUtil.encode( "https://buyertrade.taobao.com/trade/itemlist/list_bought_items.htm",StringUtil.getBase64String("YeShiFANLI889*+"),
+ StringUtil.getBase64String("*M#34f?,")));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ out.print(JsonUtil.loadTrueResult(data));
+ }
}
--
Gitblit v1.8.0