Merge branch 'master' into div

yujian

2019-07-11 e4a56b57d3e10b9b46eaefe5194bbf98fcc45698

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

@@ -68,13 +68,10 @@
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;

import com.yeshi.fanli.util.taobao.TaoLiJinUtil;

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

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

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

=======
import com.yeshi.fanli.vo.goods.taobao.TLJBuyHongBaoVO;

>>>>>>> refs/remotes/origin/master
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;

import com.yeshi.fanli.vo.tlj.SpreadHongBao;

import com.yeshi.fanli.vo.tlj.TaoLiJinDetailVO;

@@ -731,15 +728,13 @@
      data.put("count", array.size());

      data.put("list", array);

      if (page == 1) {

         try {

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

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

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

            else

               data.put("topPicture", "");

         } catch (SwiperPictureException e) {

            e.printStackTrace();

         }

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

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

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

         else

            data.put("topPicture", "");

			
         data.put("ruleUrl", configService.get("zigoulijian_rule"));

      }

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