yujian
2019-05-20 33033679c498f1493e93b8c111fbb27b48d743de
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
@@ -2027,8 +2027,6 @@
      goodsJson.put("hongBao", hongBao);
      List<ClientTextStyleVO> labels = new ArrayList<>();
      labels.add(new ClientTextStyleVO("标签内容", "#F14242"));
      labels.add(new ClientTextStyleVO("标签内容", "#00FF00"));
      goodsJson.put("labels", labels);
      data.put("tbPidInfo", clientTBPid);
@@ -2057,19 +2055,30 @@
         } 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);
      }
      goodsJson.put("fanliValid",Math.random()>0.5? true:false);// 是否有返利
      goodsJson.put("fanliValid",true);// 是否有返利
      // 分享路径
      String shareUrl = String.format("%s?id=" + tb.getAuctionId(), Constant.systemCommonConfig.getAppShareInfoUrl());