From aad0554cc7f18a6ec05e2e5e646b5e501d41617d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 10 七月 2019 17:13:49 +0800
Subject: [PATCH] 冲突文件

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
index 4953137..c35440f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
@@ -30,6 +30,7 @@
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.ThreadUtil;
+import com.yeshi.fanli.util.VersionUtil;
 
 import net.sf.json.JSONObject;
 
@@ -97,21 +98,23 @@
 
 		FloatAD floatAD = null;
 		
-		if (uid == null) {
-			DeviceTaoLiJinRecord deviceRecord = deviceTaoLiJinRecordService.getByDevice(acceptData.getDevice());
-			if (deviceRecord == null) {
-				floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 1);
+		if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {
+			if (uid == null) {
+				DeviceTaoLiJinRecord deviceRecord = deviceTaoLiJinRecordService.getByDevice(acceptData.getDevice());
+				if (deviceRecord == null) {
+					floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 1);
+				}
+			} else {
+				UserTaoLiJinOrigin userTaoLiJin = uerTaoLiJinOriginService.getByUidAndOrigin(uid, TaoLiJinOriginEnum.newbiesWin.name());
+				if (userTaoLiJin == null) {
+					floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 1);
+				}
 			}
-		} else {
-			UserTaoLiJinOrigin userTaoLiJin = uerTaoLiJinOriginService.getByUidAndOrigin(uid, TaoLiJinOriginEnum.newbiesWin.name());
-			if (userTaoLiJin == null) {
-				floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 1);
-			}
-		}
+		} 
 		
 		// 鏃犳柊浜哄脊妗� 鍒欐煡璇㈤粯璁�
 		if (floatAD == null) {
-			floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, null);
+			floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 0);
 		}
 		
 		if (floatAD != null) {

--
Gitblit v1.8.0