admin
2019-01-03 5981b2cae7c20ec9021c8ccbe1a926f35f640210
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -703,7 +703,15 @@
         data.put("tbPidInfo", clientTBPid);
         JSONObject taobaoJson = JSONObject.fromObject(gson.toJson(taoBaoGoodsBriefExtra));
         if (taoBaoGoodsBriefExtra.getImgList() != null)
            taoBaoGoodsBriefExtra.getImgList().add(0, taoBaoGoodsBriefExtra.getPictUrl());
         taobaoJson.put("imgList", taoBaoGoodsBriefExtra.getImgList());
         taobaoJson.put("saleCount", taoBaoGoodsBriefExtra.getSalesCount());// 销量(和salesCount一致,此处处理兼容)
         if (taoBaoGoodsBriefExtra.getTaoBaoQuanInfo() != null)
            taobaoJson.put("coupon", true);
         else
            taobaoJson.put("coupon", false);
         // taoBaoGoodsBriefExtra.setAuctionUrl(null);
         data.put("taobao", taobaoJson);
         String info = configService.get("detail_prompt");
@@ -1870,7 +1878,7 @@
      List<String> finalImgList = new ArrayList<>();
      for (String img : tb.getImgList()) {
         finalImgList.add(img);
         finalImgList.add(TbImgUtil.getTBSizeImg(img, 600));
      }
      JSONObject goods = new JSONObject();
@@ -2078,62 +2086,9 @@
      }
      List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.getRelationGoodsRecommend(id, 10);
      // 重新做推荐
      if (goodsList == null || goodsList.size() == 0) {
         goodsList = new ArrayList<>();
         TaoBaoGoodsBrief goods = null;
         try {
            goods = redisManager.getTaoBaoGoodsBrief(id);
         } catch (TaobaoGoodsDownException e) {
            e.printStackTrace();
         }
         if (goods == null) {
            // 从我们的商品库搜索
            CommonGoods cgoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(id,
                  CommonGoods.GOODS_TYPE_TB);
            // 商品有本地缓存
            if (cgoods != null) {
               // 按名字搜索商品
               SearchFilter sf = new SearchFilter();
               sf.setKey(cgoods.getTitle().substring(0, cgoods.getTitle().length() / 2));
               TaoBaoSearchResult result = TaoBaoUtil.search(sf);
               if (result != null && result.getTaoBaoGoodsBriefs() != null
                     && result.getTaoBaoGoodsBriefs().size() > 0) {
                  for (TaoBaoGoodsBrief gds : result.getTaoBaoGoodsBriefs()) {
                     if (goodsList.size() == 10) {
                        break;
                     }
                     goodsList.add(gds);
                  }
               }
            }
         }
         // 需要另做推荐
         if (goodsList.size() < 2) {
            try {
               List<RecommendSectionGoods> list = recommendSectionGoodsService.getSectionGoods(10);
               if (list != null) {
                  for (int i = 0; i < list.size(); i++) {
                     if (i == 10) {
                        break;
                     }
                     goodsList.add(list.get(i).getTaoBaoGoodsBrief());
                  }
               }
            } catch (Exception e2) {
               e2.printStackTrace();
            }
         }
      // 初始化
      if (goodsList == null) {
         goodsList = new ArrayList<TaoBaoGoodsBrief>();
      }
      BigDecimal proportion = manageService.getFanLiRate();