Merge remote-tracking branch 'origin/master'

yujian

2019-06-20 bf5d1b405c759de3faa42af37b1f10f42823b105

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

@@ -1337,13 +1337,19 @@


            if (result != null && result.getTaoBaoGoodsBriefs() != null) {

               // 筛选

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

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



               // 设备推荐

               for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs()) {

                  if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && goods.getCouponAmount() != null

                        && goods.getCouponAmount().compareTo(new BigDecimal("5")) >= 0

                        && goods.getBiz30day() > 1000 && !StringUtil.isNullOrEmpty(goods.getPictUrlWhite()))

                     goodsList.add(goods);

                        && goods.getBiz30day() > 1000 && !StringUtil.isNullOrEmpty(goods.getPictUrlWhite())) {



                     TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods,

                           proportion.toString(), "");

                     extra.setRecommend(true);

                     goodsList.add(extra);

                  }

               }

               try {

                  monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, 0,

@@ -1354,8 +1360,8 @@


               Collections.shuffle(goodsList);

               goodsList = goodsList.size() > 20 ? goodsList.subList(0, 20) : goodsList;

               for (TaoBaoGoodsBrief goods : goodsList) {

                  array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion.toString(), "")));

               for (TaoBaoGoodsBriefExtra goods : goodsList) {

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

               }

            } else {

               try {