yujian
2019-05-21 ff33cdfa1bd3a89ad9f5a72067b1c9b47376ef22
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
@@ -1733,6 +1733,13 @@
      root.put("time", nextTime.getTimeInMillis());
      root.put("endTime", endTime > 0? endTime : 0);
      root.put("listgoods", array);
      JSONObject params = new JSONObject();
      params.put("url", configService.get("spike_goods_link"));
      JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("web");
      root.put("params", params);
      root.put("jumpDetail", jumpDetail);
      return root;
   }
@@ -1745,13 +1752,7 @@
    */
   @RequestMapping(value = "getSpikeGoods")
   public void getSpikeGoods(AcceptData acceptData, PrintWriter out) {
      JSONObject params = new JSONObject();
      params.put("url", configService.get("spike_goods_link"));
      JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("web");
      JSONObject root = getSpikeGoodsContent(acceptData);
      root.put("params", params);
      root.put("jumpDetail", jumpDetail);
      out.print(JsonUtil.loadTrueResult(root));
   }
@@ -2055,14 +2056,25 @@
         } else {
            tbShopInfo.setUserType("0");
         }
         String shopLink = tbShopInfo.getShopUrl();
         if (StringUtil.isNullOrEmpty(shopLink)) {
            tbShopInfo.setShopUrl(TaoBaoUtil.getShopLink(tbShopInfo.getUserId()));
         }
      }
      // 店铺
      if (("android".equalsIgnoreCase(acceptData.getPlatform()) && Integer.parseInt(acceptData.getVersion()) >= 40)
            || ("ios".equalsIgnoreCase(acceptData.getPlatform())
                  && Integer.parseInt(acceptData.getVersion()) >= 49)) {
         TaoBaoShop shop = taoBaoShopService.getTaoBaoShop(goods.getAuctionId(), goods.getSellerId());
         if (shop != null)
         if (shop != null) {
            String shopLink = shop.getShopLink();
            if (StringUtil.isNullOrEmpty(shopLink)) {
               shop.setShopLink(TaoBaoUtil.getShopLink(shop.getId()));
            }
            goodsJson.put("shopInfo", shop);
         }
      } else {
         goodsJson.put("shopInfo", tbShopInfo);
      }