Merge remote-tracking branch 'origin/mater-1.6.0' into div

admin

2019-08-19 9c09cead959dbeef292628f345e5f80c30fc3d17

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java

@@ -19,13 +19,14 @@
import com.yeshi.fanli.dto.common.CommonContentTypeEnum;

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

import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;

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

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

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

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

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.ThreadUtil;

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



import net.sf.json.JSONArray;

@@ -49,6 +50,9 @@


   @Resource

   private CommonTemplateContentService commonTemplateContentService;



   @Resource

   private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;



   /**

    * 通用模板导航

@@ -89,7 +93,7 @@
      }



      CommonContentResult result = commonTemplateContentService.getContentList(CommonContentTypeEnum.valueOf(key),

            cid, page, Constant.PAGE_SIZE);

            cid, page, 10);



      // 保留暂时不开启，待后续开启

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

@@ -108,6 +112,13 @@
      root.put("goodsList", array);

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

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



      // 更新前5页数据

      if (page <= 5)

         try {

            taoBaoGoodsUpdateService.addUpdateQueueAsync(goodsList);

         } catch (Exception e) {

         }

   }



}