Merge remote-tracking branch 'origin/master'

admin

2019-05-14 aa784ab65cc24caf45a4c38af7e5fdeb526eb393

 fanli/src/main/java/com/yeshi/fanli/controller/client/SearchController.java

@@ -48,6 +48,8 @@
import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.EhcacheUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;

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

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

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

@@ -84,6 +86,9 @@
   @Resource

   private QualityGoodsService qualityGoodsService;



   @Resource

   private TaoBaoGoodsCacheUtil taoBaoGoodsCacheUtil;



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

   public void getHotSearch(AcceptData acceptData, PrintWriter out) {

      BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),

@@ -101,7 +106,8 @@
      List<HotSearch> hotSearchList = new ArrayList<HotSearch>();

      for (SuperHotSearch superHotSearch : superHotSearchList) {

         HotSearch hotSearch = superHotSearch.getHotSearch();

         hotSearchList.add(hotSearch);

         if (hotSearch != null)

            hotSearchList.add(hotSearch);

      }



      JSONObject data = new JSONObject();

@@ -615,9 +621,19 @@
               map.put(g.getAuctionId(), g.getMaterialLibType());

            for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs())

               goods.setMaterialLibType(map.get(goods.getAuctionId()));



            ThreadUtil.run(new Runnable() {

               @Override

               public void run() {

                  // 更新到緩存

                  for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs())

                     taoBaoGoodsCacheUtil.saveCommonTaoBaoGoodsInfo(goods);

               }

            });

         } catch (TaobaoGoodsDownException e) {

            e.printStackTrace();

         }



      }



      List<TaoBaoSearchNav> navList = TaoBaoUtil.getBaseNav();