From 54e6398cabe1b32b1dbc9857c6a99d8f15b549f7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 06 十一月 2019 15:31:44 +0800
Subject: [PATCH] 红包信息

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java |   66 +++++++++++++++++++++++++++++++++
 1 files changed, 66 insertions(+), 0 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 bf79c9f..ce48b9e 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
@@ -136,6 +136,72 @@
 		out.print(JsonUtil.loadTrueResult(data));
 	}
 
+	
+	/**
+	 * s 棣栭〉閰嶇疆淇℃伅
+	 * 
+	 * @param acceptData
+	 * @param out
+	 */
+	@RequestMapping(value = "getHomeConfigNew", method = RequestMethod.POST)
+	public void getHomeConfigNew(AcceptData acceptData, Long uid, PrintWriter out) {
+		if (uid != null && uid == 0L)
+			uid = null;
+
+		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);
+		}
+
+		// 鏃犳柊浜哄脊妗� 鍒欐煡璇㈤粯璁�
+		FloatAD floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 0);
+
+		if (floatAD != null) {
+			JSONObject detail = new JSONObject();
+			detail.put("img", floatAD.getPicture());
+			detail.put("jumpDetail", floatAD.getJumpDetail());
+			detail.put("params", floatAD.getParams());
+			detail.put("showTime", floatAD.getShowMode());
+			detail.put("accountLogin", floatAD.isJumpNeedLogin());
+			data.put("floatImgDetail", detail);
+		}
+
+		// 棰嗗埜甯姪閾炬帴,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"));
+		}
+
+		// 鍒ゆ柇鏂拌�佺敤鎴�
+		UserActiveLog da = null;
+		if (uid != null)
+			da = userActiveLogService.getFirstActiveInfo(uid);
+		// 鏂颁汉
+		if (da == null || (System.currentTimeMillis() - da.getCreateTime().getTime()) <= 1000 * 60 * 60 * 24 * 15L) {
+			data.put("userTimeType", 0);
+		} else {// 鑰佷汉
+			data.put("userTimeType", 1);
+		}
+		data.put("hotFuctionLink",
+				configService.getByVersion("hot_function_url", platform, Integer.parseInt(acceptData.getVersion())));
+		out.print(JsonUtil.loadTrueResult(data));
+	}
+	
+	
 	/**
 	 * 娑堟伅涓績寮规
 	 * 

--
Gitblit v1.8.0