From a2ae9b3d890bc7fcaa34ab65e5cdaf8ccfa07c2b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 13 十一月 2019 15:35:12 +0800
Subject: [PATCH] 红包弹框加入设备验证

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java |    5 +++--
 1 files changed, 3 insertions(+), 2 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 4b55c2f..1caf016 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
@@ -110,7 +110,7 @@
 		// 鏃犳柊浜哄脊妗� 鍒欐煡璇㈤粯璁�
 		FloatAD floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 0);
 
-		if (floatAD != null) {
+		if (floatAD != null && floatAD.getTypeEnum() != FloatADTypeEnum.newUserRedPack) {
 			JSONObject detail = new JSONObject();
 			detail.put("img", floatAD.getPicture());
 			detail.put("jumpDetail", floatAD.getJumpDetail());
@@ -167,9 +167,10 @@
 		for (int i = 0; i < listAD.size(); i++) {
 			FloatAD floatAD = listAD.get(i);
 			FloatADTypeEnum typeEnum = floatAD.getTypeEnum();
-			if (typeEnum == FloatADTypeEnum.newUserRedPack && !redPackWinNewUserService.verifyHasReward(uid)) {
+			if (typeEnum == FloatADTypeEnum.newUserRedPack && !redPackWinNewUserService.verifyHasReward(uid, acceptData.getDevice())) {
 				listAD.remove(i);
 				i--;
+				continue;
 			}
 			
 			JumpDetailV2 jumpDetail = floatAD.getJumpDetail();

--
Gitblit v1.8.0