2.1需求

yujian

2020-05-09 7e7db2fa55a9a3af46d4fd8ede0dee147f101d64

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

@@ -1,7 +1,6 @@
package com.yeshi.fanli.controller.client.v2;



import java.io.PrintWriter;

import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.List;



@@ -33,11 +32,10 @@
import com.yeshi.fanli.service.inter.goods.JDCommonTemplateContentService;

import com.yeshi.fanli.service.inter.goods.PDDCommonTemplateContentService;

import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;

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

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

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;

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

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

@@ -60,7 +58,7 @@
   private SwiperPictureService swiperPictureService;



   @Resource

   private HongBaoManageService hongBaoManageService;

   private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;



   @Resource

   private CommonTemplateContentService commonTemplateContentService;

@@ -147,7 +145,7 @@
         // 猜你喜欢

         String idfa = acceptData.getIdfa();

         String imei = acceptData.getImei();

         result = guessLikeDeviceTB(idfa, imei, page);

         result = guessLikeDeviceTB(idfa, imei, acceptData.getUtdid(), page);

      } else {

         // 大淘客页码只能为10,50,100,200

         result = commonTemplateContentService.getContentList(type, cid, page, 10);

@@ -162,9 +160,11 @@


      JSONArray array = new JSONArray();

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

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

      List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();

      if (result != null)

         goodsList = result.getGoodsList();



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

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

            acceptData.getVersion());

      for (TaoBaoGoodsBrief taoBaoGoodsBrief : goodsList) {

         GoodsDetailVO vo = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, paramsDTO);

@@ -178,7 +178,7 @@
      }



      root.put("list", array);

      root.put("count", result.getCount());

      root.put("count", result != null ? result.getCount() : 0);

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

   }



@@ -213,9 +213,9 @@
         if (goodsList != null && goodsList.size() > 0) {

            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 (JDGoods goods : goodsList) {

               array.add(gson.toJson(GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO)));

            }

@@ -242,7 +242,8 @@
         // 2、顶部轮播图

         List<SwiperPicture> bannerList = null;

         if (Constant.IS_TEST) {

            bannerList = swiperPictureService.getByBannerCardAndVersion("index_top",acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));

            bannerList = swiperPictureService.getByBannerCardAndVersion("index_top", acceptData.getPlatform(),

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

         }



         if (bannerList == null) {

@@ -263,9 +264,9 @@
         if (goodsList != null && goodsList.size() > 0) {

            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 (PDDGoodsDetail goods : goodsList) {

               array.add(gson.toJson(GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO)));

            }

@@ -285,8 +286,8 @@
    * @return

    */

   @Cacheable(value = "commonContentCache", key = "#idfa+'-'+#imei+'-'+#page")

   private CommonContentResult guessLikeDeviceTB(String idfa, String imei, Integer page) {

      TaoBaoSearchResult searchResult = TaoKeApiUtil.guessDeviceLike(page, Constant.PAGE_SIZE, imei, idfa);

   private CommonContentResult guessLikeDeviceTB(String idfa, String imei, String utdid, Integer page) {

      TaoBaoSearchResult searchResult = TaoKeApiUtil.guessDeviceLike(page, Constant.PAGE_SIZE, imei, idfa, utdid);

      if (searchResult != null && searchResult.getTaoBaoGoodsBriefs() != null

            && searchResult.getTaoBaoGoodsBriefs().size() > 0) {

         CommonContentResult result = new CommonContentResult();