Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-12 e068c9acf06cff7673fadfca686128f6d6d66e20

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

@@ -1357,6 +1357,13 @@
         List<TaoBaoGoodsBrief> goodsList = homeRecommendGoodsService.listGoodsByPage(null, acceptData.getDevice(),

               imei, idfa, page);



         if (page < 4) {// 前三页加入更新

            try {

               taoBaoGoodsUpdateService.addUpdateQueueAsync(goodsList);

            } catch (Exception e) {

            }

         }



         BigDecimal rate = hongBaoManageService.getFanLiRate();

         for (TaoBaoGoodsBrief goods : goodsList) {

            TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, rate + "", null);