饿了么绘图，添加口碑

admin

2020-05-19 744594ef1a2f530fc3e86ea9dc48b62247f79420

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

@@ -21,7 +21,6 @@
import com.yeshi.fanli.entity.brand.BrandInfoRecord;

import com.yeshi.fanli.entity.brand.BrandShopCahe;

import com.yeshi.fanli.entity.brand.TaoBaoShopHistory;

import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;

import com.yeshi.fanli.entity.jd.JDGoods;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoBaoShop;

@@ -51,6 +50,7 @@
import com.yeshi.fanli.vo.brand.BrandInfoVO;

import com.yeshi.fanli.vo.goods.GoodsDetailVO;

import com.yeshi.fanli.vo.goods.ShopInfoVO;

import com.yeshi.fanli.vo.homemodule.BannerVO;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

@@ -423,12 +423,12 @@
      }

      

      List<TaoBaoShop> shopList = new ArrayList<TaoBaoShop>();

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

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

      

      JSONObject data = new JSONObject();

      if (page == 1) {

         // 2、顶部轮播图

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

         List<BannerVO> 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);

@@ -669,7 +669,7 @@
      

      JSONObject data = new JSONObject();

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

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

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

         if (banners == null)

            banners = new ArrayList<>();

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

@@ -749,8 +749,8 @@
      JSONObject data = new JSONObject();

      if (page == 1 && array.size() > 0) {

         // 2、顶部轮播图

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

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

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

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

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

            topPicList.addAll(oldtopPicList);