From ea022e84777312b730257dfcf2a33e865c8e07b7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 26 十一月 2019 14:23:46 +0800
Subject: [PATCH] 资金明细接口增加筛选

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 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 a34e0c7..32e30e8 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
@@ -167,19 +167,10 @@
 		for (int i = 0; i < listAD.size(); i++) {
 			FloatAD floatAD = listAD.get(i);
 			FloatADTypeEnum typeEnum = floatAD.getTypeEnum();
-			
-			if (typeEnum == FloatADTypeEnum.newUserRedPack) {
-				if (!VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
-					listAD.remove(i);
-					i--;
-					continue;
-				}
-				
-				if (!redPackWinNewUserService.verifyHasReward(uid)) {
-					listAD.remove(i);
-					i--;
-					continue;
-				}
+			if (typeEnum == FloatADTypeEnum.newUserRedPack && !redPackWinNewUserService.verifyHasReward(uid, acceptData.getDevice())) {
+				listAD.remove(i);
+				i--;
+				continue;
 			}
 			
 			JumpDetailV2 jumpDetail = floatAD.getJumpDetail();
@@ -205,6 +196,7 @@
 
 		JSONObject data = new JSONObject();
 		data.put("listAD", JsonUtil.getApiCommonGson().toJson(listVO));
+		data.put("protocol", configService.get("user_protocol_home_data"));
 
 		// 棰嗗埜甯姪閾炬帴,1.5.2鍚庣敓鏁�
 		String couponHelp = configService.get("taobao_coupon_help");

--
Gitblit v1.8.0