From 207dc8655711cddac2653e18b51e58a88dba2084 Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期五, 06 三月 2020 18:14:36 +0800
Subject: [PATCH] 发圈处理
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java | 74 +++----------------------------------
1 files changed, 6 insertions(+), 68 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
index c76cf2b..89fe953 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
@@ -168,12 +168,14 @@
public void getHomeConfigNew(AcceptData acceptData, Long uid, String callback, PrintWriter out) {
if (uid != null && uid == 0L)
uid = null;
+
+ String platform = acceptData.getPlatform();
+ String version = acceptData.getVersion();
// 娲诲姩寮规
List<FloatAD> listAD = new ArrayList<FloatAD>();
List<FloatImgDetailVO> listVO = new ArrayList<FloatImgDetailVO>();
-
- List<FloatAD> list = floatADService.getValidByPosition(FloatAD.POSITION_INDEX);
+ List<FloatAD> list = floatADService.getValidFloatADCache(FloatAD.POSITION_INDEX, null, platform,Integer.parseInt(version) );
if (list != null && !list.isEmpty())
listAD.addAll(list);
@@ -181,7 +183,7 @@
FloatAD floatAD = listAD.get(i);
FloatADTypeEnum typeEnum = floatAD.getTypeEnum();
if (typeEnum == FloatADTypeEnum.newUserRedPack
- && (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())
+ && (!VersionUtil.greaterThan_2_0_5(platform, version)
|| !userTaoLiJinNewbiesService.verifyHasReward(uid, acceptData.getDevice()))) {
listAD.remove(i);
@@ -230,9 +232,8 @@
}
// 鏄惁鏄剧ず鐑棬鍔熻兘鎸夐挳
- String platform = acceptData.getPlatform();
data.put("hotFuctionLink",
- configService.getByVersion(ConfigKeyEnum.hotFunctionUrl.getKey(), platform, Integer.parseInt(acceptData.getVersion())));
+ configService.getByVersion(ConfigKeyEnum.hotFunctionUrl.getKey(), platform, Integer.parseInt(version)));
if (StringUtil.isNullOrEmpty(callback))
out.print(JsonUtil.loadTrueResult(data));
else
@@ -379,69 +380,6 @@
data.put("alipayHelp", alipayHelpUrl);
data.put("alipayBindFailReason", alipayBindFailUrl);
out.print(JsonUtil.loadTrueResult(data));
- }
-
- @RequestMapping(value = "getUserConfig", method = RequestMethod.POST)
- public void getUserConfig(AcceptData acceptData, PrintWriter out) {
- try {
- // 鐢ㄦ埛鍗忚閾炬帴
- String serviceProtocol = configService.get(ConfigKeyEnum.serviceProtocolLink.getKey());
- // 闅愮鏉℃閾炬帴
- String privacyProtocol = configService.get(ConfigKeyEnum.privacyProtocolLink.getKey());
- JSONObject data = new JSONObject();
- data.put("serviceProtocolLink", serviceProtocol);
- data.put("privacyProtocolLink", privacyProtocol);
- // 璐墿杞﹁烦杞柟寮�(鍖呭惈jumpDetail涓巔arams)
- JSONObject source = JSONObject.fromObject(configService.get(ConfigKeyEnum.taobaoCartJumpDetail.getKey()));
- data.put("taoBaoCart", source);
- 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, int type, PrintWriter out) {
-
- switch (type) {
- case Constant.SOURCE_TYPE_TAOBAO:
- if ("0".equalsIgnoreCase(configService.get(ConfigKeyEnum.autoFindTaobaoOrder.getKey())))
- out.print(JsonUtil.loadFalseResult(1, "鏆備笉鏀寔"));
- else {
- String orderJS = configService.get(ConfigKeyEnum.taobaoOrderParseJS.getKey());
- 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));
- }
- break;
-
- case Constant.SOURCE_TYPE_JD: {
-
- }
- break;
-
- case Constant.SOURCE_TYPE_PDD: {
-
- }
- break;
- }
}
/**
--
Gitblit v1.8.0