Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -50,6 +50,7 @@
import com.yeshi.fanli.service.inter.money.UserMoneyExtraService;

import com.yeshi.fanli.service.inter.monitor.BusinessEmergent110Service;

import com.yeshi.fanli.service.inter.monitor.MonitorService;

import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.redpack.UserTaoLiJinNewbiesService;

import com.yeshi.fanli.service.inter.taobao.ShareHotGoodsService;

@@ -73,6 +74,7 @@
import com.yeshi.fanli.vo.goods.MoneyInfoVO;

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

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

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

import com.yeshi.fanli.vo.msg.ClientTextStyleVO;

import com.yeshi.fanli.vo.redpack.TaoLiJinWinDetailVO;

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

@@ -155,6 +157,9 @@


   @Resource

   private TLJFreeBuyGoodsService tljFreeBuyGoodsService;

	
   @Resource

   private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;



   /**

    * 获取淘礼金分享记录

@@ -487,7 +492,7 @@
         }

      }



      ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),

      ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),

            acceptData.getVersion());



      for (ShareHotGoods hotGoods : listHot) {

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

      data.put("list", array);

      if (page == 1) {

         List<SwiperPicture> bannerList = swiperPictureService.getByBannerCardAndVersion("zigoulijian_banner",

         List<BannerVO> bannerList = swiperPictureService.getByBannerCardAndVersion("zigoulijian_banner",

               acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));



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

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

      data.put("list", array);

      if (page == 1) {

         List<SwiperPicture> bannerList = swiperPictureService.getByBannerCardAndVersion("zigoulijian_banner",

         List<BannerVO> bannerList = swiperPictureService.getByBannerCardAndVersion("zigoulijian_banner",

               acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));



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

@@ -751,9 +756,9 @@
         }



         // 2、顶部轮播图

         List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCardAndVersion(

         List<BannerVO> oldtopPicList = swiperPictureService.getByBannerCardAndVersion(

               "redpack_win_detail_banner", acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));

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

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

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

            topPicList.addAll(oldtopPicList);



@@ -789,7 +794,7 @@
      Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

            .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();



      ConfigParamsDTO paramsDTO = hongBaoManageService.getShowComputeRate(acceptData.getPlatform(),

      ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),

            acceptData.getVersion());



      for (TLJFreeBuyGoods freeGoods : listFree) {