From 63d7d733938c8ea2fbb046625f1f70d6c48f8673 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 14 十二月 2019 11:08:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 dafb369..bfc0434 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
@@ -178,7 +178,9 @@
FloatAD floatAD = listAD.get(i);
FloatADTypeEnum typeEnum = floatAD.getTypeEnum();
if (typeEnum == FloatADTypeEnum.newUserRedPack
- && !userTaoLiJinNewbiesService.verifyHasReward(uid, acceptData.getDevice())) {
+ && (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())
+ || !userTaoLiJinNewbiesService.verifyHasReward(uid, acceptData.getDevice()))) {
+
listAD.remove(i);
i--;
continue;
--
Gitblit v1.8.0