admin
2020-01-01 c8f11c229b87d1652b6da0b15576c166cd51eb8b
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
@@ -15,6 +15,7 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.homemodule.FloatAD;
import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.bus.homemodule.FloatAD.FloatADTypeEnum;
import com.yeshi.fanli.entity.bus.msg.MsgDeviceReadState;
import com.yeshi.fanli.entity.bus.user.UserActiveLog;
import com.yeshi.fanli.entity.config.AppHomeFloatImg;
@@ -106,8 +107,7 @@
      // 无新人弹框 则查询默认
      FloatAD floatAD = floatADService.getEffectiveFloatAD(FloatAD.POSITION_INDEX, 0);
      if (floatAD != null) {
      if (floatAD != null && floatAD.getTypeEnum() != FloatADTypeEnum.newUserRedPack) {
         JSONObject detail = new JSONObject();
         detail.put("img", floatAD.getPicture());
         detail.put("jumpDetail", floatAD.getJumpDetail());
@@ -254,7 +254,7 @@
         
         if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
            // 我的界面banner
            List<SwiperPicture> banner = swiperPictureService.getByBannerCard("my_interface_banner");
            List<SwiperPicture> banner = swiperPictureService.getByBannerCardAndVersion("my_interface_banner",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
            if (banner == null)
               banner = new ArrayList<SwiperPicture>();
            data.put("banner", JsonUtil.getApiCommonGson().toJson(banner));