admin
2020-05-06 24a8d17e007545f7426c48352109aa1a9c6587ee
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java
@@ -7,6 +7,7 @@
import javax.annotation.Resource;
import org.json.JSONArray;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -327,12 +328,18 @@
         data.put("taoBaoCart", source);
         if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
            // 我的界面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));
            // IOS正在上线版本
            if ("ios".equalsIgnoreCase(acceptData.getPlatform())
                  && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {
               data.put("banner", new JSONArray());
            } else {
               // 我的界面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));
            }
         }
         if (VersionUtil.greaterThan_2_0_7(acceptData.getPlatform(), acceptData.getVersion())) {
@@ -398,7 +405,11 @@
                  }
               }
            }
            data.put("vip", inner);
            // IOS正在上线
            if ("ios".equalsIgnoreCase(acceptData.getPlatform())
                  && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {
            } else
               data.put("vip", inner);
            // 平台规则
            String platformRuleLink = configService.get(ConfigKeyEnum.platformRule.getKey());
            data.put("platformRule", platformRuleLink);