分享爆品修改

admin

2019-06-27 534e0d10fdedf5fdaba6f63c99605520314a97d4

 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,17 +98,19 @@


      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) {