品牌日志

yujian

2019-12-20 eda5d0e998204c7a49ab84d8528569b765bec2f9

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

@@ -616,7 +616,7 @@
      data.put("count", array.size());

      data.put("list", array);

      if (page == 1) {

         List<SwiperPicture> bannerList = swiperPictureService.getByBannerCard("zigoulijian_banner");

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



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

            data.put("topPicture", bannerList.get(0).getSrc());

@@ -703,7 +703,7 @@
      data.put("count", array.size());

      data.put("list", array);

      if (page == 1) {

         List<SwiperPicture> bannerList = swiperPictureService.getByBannerCard("zigoulijian_banner");

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



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

            data.put("topPicture", bannerList.get(0).getSrc());

@@ -752,7 +752,7 @@
         }



         // 2、顶部轮播图

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

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

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

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

            topPicList.addAll(oldtopPicList);

@@ -842,9 +842,12 @@
            }

         }

         

         String rule = configTaoLiJinService.getValueByKey("new_user_free_buy_list_rule");

         rule = rule.replace("{链接}", configService.get("customer_service_link"));

			
         data.put("state", state);

         data.put("balance","新人红包：" + balance.setScale(2) + "元");

         data.put("rule", configTaoLiJinService.getValueByKey("new_user_free_buy_list_rule"));

         data.put("rule", rule);

      }

      JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));

   }