From 100c4cdf73b6df2766e37f65a801ce59cf07869f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 十一月 2019 14:54:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java | 17 ++++-------------
1 files changed, 4 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..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
@@ -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();
--
Gitblit v1.8.0