帮助中心

yujian

2019-12-19 626d711cb15896055c13fe344eb7fcc824589715

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java

@@ -430,7 +430,7 @@
      JSONObject data = new JSONObject();

      if (page == 1) {

         // 2、顶部轮播图

         List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCard("brand_picture");

         List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCardAndVersion("brand_picture",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));

         if (oldtopPicList != null && oldtopPicList.size() > 0)

            topPicList.addAll(oldtopPicList);

         TaoBaoShop taoBaoShop = taoBaoShopService.selectByPrimaryKey(id);

@@ -747,7 +747,7 @@
      if (page == 1 && array.size() > 0) {

         // 2、顶部轮播图

         List<SwiperPicture> topPicList = new ArrayList<>();

         List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCard("brand_picture");

         List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCardAndVersion("brand_picture",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));

         if (oldtopPicList != null && oldtopPicList.size() > 0)

            topPicList.addAll(oldtopPicList);

         

@@ -762,7 +762,7 @@
         data.put("shopList", JsonUtil.getApiCommonGson().toJson(shopList));

      }

      

      data.put("count", 50);

      data.put("count", array.size());

      data.put("list", array);

      out.print(JsonUtil.loadTrueResult(data));

   }