大淘客搜索接口升级

admin

2020-11-28 dc5be7d38446f70e6ff86df311119c32b41fe7f8

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsClassControllerV2.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;



@@ -15,13 +14,14 @@


import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.yeshi.fanli.dto.ConfigParamsDTO;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.clazz.GoodsClass;

import com.yeshi.fanli.entity.bus.clazz.GoodsSubClass;

import com.yeshi.fanli.entity.bus.clazz.TaoBaoClass;

import com.yeshi.fanli.entity.bus.lable.QualityFactory;

import com.yeshi.fanli.entity.taobao.SearchFilter;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.clazz.GoodsSubClassLabelService;

@@ -31,7 +31,7 @@
import com.yeshi.fanli.service.inter.lable.LabelClassService;

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

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

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

@@ -69,7 +69,7 @@
   private TaoBaoClassService taoBaoClassService;



   @Resource

   private HongBaoManageService hongBaoManageService;

   private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;



   @Resource

   private LabelClassService labelClassService;

@@ -99,7 +99,6 @@
    * 二级分类、标签

    * 

    * @param acceptData

    * @param gcid

    * @param out

    */

   @RequestMapping(value = "listSubMap", method = RequestMethod.POST)

@@ -167,7 +166,7 @@
         filter.setPageSize(pageSize);

         filter.setCateIds(taoBaoCatIds);



         JSONObject result = taoKeGoodsService.searchWuLiaoV2(filter);

         JSONObject result = taoKeGoodsService.searchWuLiaoV2(filter,acceptData.getPlatform(),acceptData.getVersion(), acceptData.getSystem());

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

         return;

      }

@@ -175,9 +174,9 @@
      Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

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



      BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

      BigDecimal shareRate = hongBaoManageService.getShareRate();



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

            acceptData.getVersion(),acceptData.getSystem());

		
      // 精选库数据

      JSONArray array = new JSONArray();

      for (QualityFactory selectionGoods : listQuery) {

@@ -186,8 +185,7 @@
            continue;

         }

         updateGoodsList.add(taoBaoGoodsBrief);

         GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, fanLiRate,

               shareRate);

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

         array.add(gson.toJson(goodsDetailVO));

      }



@@ -264,7 +262,7 @@
               searchfilter.setMaterialId("6707");

            taoKeGoodsService.setSearchFilter(searchfilter, filter, order, startprice, endprice, fastFilter,

                  totalSales);

            TaoBaoSearchResult searchResult = TaoKeApiUtil.searchWuLiao(searchfilter);

            TaoBaoSearchResult searchResult = TaoKeApiUtil.searchWuLiao(searchfilter,null,null);

            long count = searchResult.getPageEntity().getTotalCount();



            List<TaoBaoGoodsBrief> resultGoodsList = searchResult.getTaoBaoGoodsBriefs();

@@ -279,7 +277,7 @@
               searchfilter.setPage((int) (count % 20 == 0 ? count / 20 - 1 : count / 20));

               searchfilter.setPageSize(20);

               searchfilter.setKey(goodsSubClass.getKey());

               TaoBaoSearchResult searchResult2 = TaoKeApiUtil.searchWuLiao(searchfilter);

               TaoBaoSearchResult searchResult2 = TaoKeApiUtil.searchWuLiao(searchfilter,null,null);

               if (searchResult2 != null) {

                  List<TaoBaoGoodsBrief> resultListTemp = searchResult2.getTaoBaoGoodsBriefs();

                  if (resultListTemp != null)

@@ -291,15 +289,14 @@
                  .excludeFieldsWithoutExposeAnnotation().create();



            JSONArray array = new JSONArray();

            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();

            if (resultGoodsList != null)

            if (resultGoodsList != null) {

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

                     acceptData.getVersion(),acceptData.getSystem());

               for (TaoBaoGoodsBrief goods : resultGoodsList) {

                  GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertTaoBao(goods, null, fanLiRate,

                        shareRate);

                  GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertTaoBao(goods, paramsDTO);

                  array.add(gson2.toJson(goodsDetailVO));

               }



            }

            JSONObject result = new JSONObject();

            result.put("result", array);

            result.put("count", result.optLong("count") + count);

@@ -318,7 +315,7 @@
            taoKeGoodsService.setSearchFilter(searchfilter, filter, order, startprice, endprice, fastFilter,

                  totalSales);



            JSONObject result = taoKeGoodsService.searchWuLiaoV2(searchfilter);

            JSONObject result = taoKeGoodsService.searchWuLiaoV2(searchfilter,acceptData.getPlatform(),acceptData.getVersion(),acceptData.getSystem());

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

            return;

         }