admin
2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConfigControllerV2.java
@@ -168,12 +168,14 @@
   public void getHomeConfigNew(AcceptData acceptData, Long uid, String callback, PrintWriter out) {
      if (uid != null && uid == 0L)
         uid = null;
      String platform = acceptData.getPlatform();
      String version = acceptData.getVersion();
      // 活动弹框
      List<FloatAD> listAD = new ArrayList<FloatAD>();
      List<FloatImgDetailVO> listVO = new ArrayList<FloatImgDetailVO>();
      List<FloatAD> list = floatADService.getValidByPosition(FloatAD.POSITION_INDEX);
      List<FloatAD> list = floatADService.getValidFloatADCache(FloatAD.POSITION_INDEX, null, platform,Integer.parseInt(version) );
      if (list != null && !list.isEmpty())
         listAD.addAll(list);
@@ -181,7 +183,7 @@
         FloatAD floatAD = listAD.get(i);
         FloatADTypeEnum typeEnum = floatAD.getTypeEnum();
         if (typeEnum == FloatADTypeEnum.newUserRedPack
               && (!VersionUtil.greaterThan_2_0_5(acceptData.getPlatform(), acceptData.getVersion())
               && (!VersionUtil.greaterThan_2_0_5(platform, version)
                     || !userTaoLiJinNewbiesService.verifyHasReward(uid, acceptData.getDevice()))) {
            listAD.remove(i);
@@ -230,9 +232,8 @@
      }
      // 是否显示热门功能按钮
      String platform = acceptData.getPlatform();
      data.put("hotFuctionLink",
            configService.getByVersion(ConfigKeyEnum.hotFunctionUrl.getKey(), platform, Integer.parseInt(acceptData.getVersion())));
            configService.getByVersion(ConfigKeyEnum.hotFunctionUrl.getKey(), platform, Integer.parseInt(version)));
      if (StringUtil.isNullOrEmpty(callback))
         out.print(JsonUtil.loadTrueResult(data));
      else