学院

yujian

2019-12-28 c3f10da9aa6f4d8fecccc1c9574567ee0766ab48

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

@@ -1,7 +1,6 @@
package com.yeshi.fanli.controller.client.v2;



import java.io.PrintWriter;

import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.List;



@@ -663,19 +662,25 @@
         out.print(JsonUtil.loadFalseResult("页码不正确"));

         return;

      }

		
      if (cid != null && cid == 0) {

         cid = null;

      }

      

		
      JSONObject data = new JSONObject();

      if (page == 1  && cid == null) { // 精选页banner

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

         if (banners == null)

            banners = new ArrayList<>();

         data.put("banners", JsonUtil.getApiCommonGson().toJson(banners));

      }

		
      if (page == 1 && cid != null) {

         List<BrandInfo> brandlist = brandInfoService.listValidByCidToApp(cid);

         if(brandlist == null)

            brandlist = new ArrayList<BrandInfo>();

         data.put("brandlist", JsonUtil.getApiCommonGson().toJson(brandlist));

      }

		
      

      long count = brandInfoService.countValidByCidToApp(cid);