From 97f5e5b7e55b8907480385414236e9dac89eb857 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 29 四月 2019 18:20:21 +0800
Subject: [PATCH] 修改商品标签版本兼容
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
index f00a002..bb73859 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
+++ b/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);
--
Gitblit v1.8.0