admin
2019-05-08 c5410b7f48a774e4ecd50019b46bc9173f2483ae
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -2010,8 +2010,8 @@
      goodsJson.put("hongBao", hongBao);
      List<ClientTextStyleVO> labels = new ArrayList<>();
      labels.add(new ClientTextStyleVO("标签测试内容1", "#FF0000"));
      labels.add(new ClientTextStyleVO("标签测试内容2", "#00FF00"));
      labels.add(new ClientTextStyleVO("标签测试内容", "#FF0000"));
      labels.add(new ClientTextStyleVO("标签测试内容", "#00FF00"));
      goodsJson.put("labels", labels);
      data.put("tbPidInfo", clientTBPid);
@@ -2042,7 +2042,9 @@
         }
      }
      // 店铺
      if ("android".equalsIgnoreCase(acceptData.getPlatform())&&Integer.parseInt(acceptData.getVersion()) >= 40) {
      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)
            goodsJson.put("shopInfo", shop);