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/RecommendControllerV2.java

@@ -45,6 +45,7 @@
import com.yeshi.fanli.service.inter.lable.QualityFlashSaleService;

import com.yeshi.fanli.service.inter.lable.QualityGoodsService;

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.pdd.PDDGoodsService;

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

@@ -66,6 +67,7 @@
import com.yeshi.fanli.vo.goods.GoodsDetailVO;

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

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

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

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

import com.yeshi.fanli.vo.search.SearchKeyTOPVO;

import com.yeshi.fanli.vo.search.SearchKeyVO;

@@ -79,7 +81,7 @@
public class RecommendControllerV2 {



   @Resource

   private HongBaoManageService hongBaoManageService;

   private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;



   @Resource

   private QualityGoodsService qualityGoodsService;

@@ -131,6 +133,9 @@


   @Resource

   private HongBaoV2CountService hongBaoV2CountService;

	
   @Resource

   private HongBaoManageService hongBaoManageService;



   /**

    * 新版推荐专题管理(1.5.3)

@@ -148,17 +153,17 @@
         JSONObject root = specialService.listCacheSpecialToIndex(acceptData, deviceSex);



         // 2、顶部轮播图

         List<SwiperPicture> oldtopPicList = swiperPictureService.getByBannerCardAndVersion("index_top",

         List<BannerVO> oldtopPicList = swiperPictureService.getByBannerCardAndVersion("index_top",

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



         root.put("topPicList", JsonUtil.getApiCommonGson().toJson(topPicList));



         // 3、邀请有奖

         List<SwiperPicture> invitePicList = null;

         List<BannerVO> invitePicList = null;

         if ("ios".equalsIgnoreCase(acceptData.getPlatform())

               && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {

            // 如果IOS当前版本处于审核状态就不返回

@@ -168,7 +173,7 @@
         }



         if (invitePicList == null) {

            invitePicList = new ArrayList<SwiperPicture>();

            invitePicList = new ArrayList<BannerVO>();

         }

         root.put("invitePicList", JsonUtil.getApiCommonGson().toJson(invitePicList));



@@ -276,7 +281,7 @@


         /* 遍历列表数据 */



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

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

               acceptData.getVersion());



         for (DaTaoKeDetailV2 detail : listGoods) {

@@ -408,7 +413,7 @@
      Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

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

      if (detailList != null) {

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

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

               acceptData.getVersion());



         for (DaTaoKeDetailV2 detail : detailList) {

@@ -553,7 +558,7 @@
            }

         }



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

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

               acceptData.getVersion());



         for (TaoBaoGoodsBrief goods : goodsList) {

@@ -629,7 +634,7 @@


               // 设备推荐

               if (gList != null) {

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

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

                        acceptData.getVersion());

                  for (TaoBaoGoodsBrief goods : gList) {

                     if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && goods.getCouponAmount() != null

@@ -701,7 +706,7 @@


         List<JDGoods> goodsList = result.getGoodsList();

         if (goodsList != null && goodsList.size() > 0) {

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

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

                  acceptData.getVersion());



            Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

@@ -734,7 +739,7 @@
         Gson gson = JsonUtil.getApiCommonGson();

         List<PDDGoodsDetail> goodsList = result.getGoodsList();

         if (goodsList != null && goodsList.size() > 0) {

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

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

                  acceptData.getVersion());



            for (PDDGoodsDetail goods : goodsList) {

@@ -768,7 +773,7 @@
         JSONArray arrayKeys = JSONArray.fromObject(keys);

         if (arrayKeys != null && arrayKeys.size() > 0) {

            count = arrayKeys.size();

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

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

                  acceptData.getVersion());



            int j = 1;