订单补偿 + 奖励券使用倒计时

yujian

2019-10-21 d085ca89e39b4cda025a9a53d3797fbe8b242ae7

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

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

      if (page == 1) {

         // 2、顶部轮播图

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

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

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

            topPicList.addAll(oldtopPicList);

         TaoBaoShop taoBaoShop = taoBaoShopService.selectByPrimaryKey(id);

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

         // 2、顶部轮播图

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

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

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

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

            topPicList.addAll(oldtopPicList);