admin
2019-08-06 9a78d406f8b821117c78a1bc717fe4b5813656b1
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RecommendControllerV2.java
@@ -109,7 +109,6 @@
   @Resource
   private PDDGoodsService pddGoodsService;
    
   /**
    * 新版推荐专题管理(1.5.3)
    * 
@@ -165,8 +164,6 @@
      }
   }
   
   /**
    * 限时秒杀 1.5.3
    * 
@@ -178,8 +175,6 @@
      JSONObject root = getSpikeGoodsContent(acceptData);
      out.print(JsonUtil.loadTrueResult(root));
   }
   private JSONObject getSpikeGoodsContent(AcceptData acceptData) {
      // 下一次倒计时的时间
@@ -253,7 +248,8 @@
            if (taoBaoGoodsBrief == null) {
               continue;
            }
            GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, fanLiRate, shareRate);
            GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, fanLiRate,
                  shareRate);
            
            JSONObject params = new JSONObject();
            params.put("url", configService.get("spike_goods_link") + "?id=" + taoBaoGoodsBrief.getAuctionId());
@@ -290,21 +286,22 @@
      return root;
   }
   
   /**
    * 首页底部商品推荐
    *
    * @param acceptData
    * @param out
    */
   @RequestMapping(value = "getGoodList")
   public void getGoodList(AcceptData acceptData, Integer goodsType, Integer page,   HttpServletRequest request, PrintWriter out) {
   public void getGoodList(AcceptData acceptData, Integer goodsType, Integer page, HttpServletRequest request,
         PrintWriter out) {
      
      if (goodsType == null || page == null) {
         out.print(JsonUtil.loadFalseResult("参数信息不正常"));
         return;
      }
      
      try {
      if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
         taoBaoGuessUserLikeByDevice(acceptData, page, request, out);
         return;
@@ -320,9 +317,14 @@
         return;
      }
      out.print(JsonUtil.loadFalseResult("商品类型错误"));
      } catch (Exception e) {
         LogHelper.errorDetailInfo(e);
         JSONObject data = new JSONObject();
         data.put("list", new JSONArray());
         data.put("count", 0);
         out.print(JsonUtil.loadTrueResult(data));
   }
   }
   
   /**
    * 根据设备信息获取猜你喜欢的内容
@@ -333,7 +335,8 @@
    * @param idfa
    *            -IOS的idfa广告标识信息
    */
   public void taoBaoGuessUserLikeByDevice(AcceptData acceptData, int page, HttpServletRequest request, PrintWriter out) {
   public void taoBaoGuessUserLikeByDevice(AcceptData acceptData, int page, HttpServletRequest request,
         PrintWriter out) {
      int pageSize = Constant.PAGE_SIZE;
      JSONArray array = new JSONArray();
      Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
@@ -364,9 +367,11 @@
               for (int i = list.size() - 1; i >= 0; i--) {
                  TLJBuyGoods goods = list.get(i);
                  BigDecimal rateBuy = TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE;
                  GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods.getGoods(), null, rateBuy, rateBuy);
                  GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods.getGoods(), null, rateBuy,
                        rateBuy);
                  
                  String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(goods.getGoods(),TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);
                  String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(goods.getGoods(),
                        TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);
                  
                  ReduceHongBao reduceHongBao = new ReduceHongBao();
                  reduceHongBao.setLeft(goods.getLeftHongBaoCount());
@@ -424,7 +429,8 @@
                           && goods.getBiz30day() > 1000
                           && !StringUtil.isNullOrEmpty(goods.getPictUrlWhite())) {
                        
                        GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods, null, fanLiRate, shareRate);
                        GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(goods, null, fanLiRate,
                              shareRate);
                        detailVO.setRecommend(true);
                        goodsList.add(detailVO);
                     }
@@ -468,11 +474,9 @@
      out.print(JsonUtil.loadTrueResult(data));
   }
   
   /**
    * 京东首页商品
    *
    * @param acceptData
    * @param page
    * @param out
@@ -506,9 +510,9 @@
      out.print(JsonUtil.loadTrueResult(data));
   }
   /**
    *   爆款排行商品-实时热销榜
    *
    * @param acceptData
    * @param page
    * @param out