From 90b211c63f9d596aa90b508f76eb916a30b68731 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 02 八月 2019 16:01:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java
index 78155da..13d3adc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java
@@ -104,7 +104,6 @@
textStyleVO.setContent("浜笢鑷惀");
textStyleVO.setColor("#E42219");
labels.add(textStyleVO);
- goodsInfo.setLabels(labels);
}
// 鎷煎洟浠�
JDPingouInfo pinGouInfo = otherDTO.getPinGouInfo();
@@ -117,12 +116,12 @@
}
ClientTextStyleVO textStyleVO = new ClientTextStyleVO();
textStyleVO.setContent("鎷艰喘");
- textStyleVO.setColor("#FF9600");
+ textStyleVO.setColor("#E42219");
labels.add(textStyleVO);
- goodsInfo.setLabels(labels);
} else {
goodsInfo.setPriceName("浜笢浠�");
}
+ goodsInfo.setLabels(labels);
} else if (goodsType == Constant.SOURCE_TYPE_PDD) {
goodsInfo.setSalesType(4); // 鎬婚攢閲�
goodsInfo.setPriceName("鎷煎洟浠�");
@@ -431,6 +430,7 @@
// 浜笢鑷惀鏍囩
String owner = goods.getOwner();
if (!StringUtil.isNullOrEmpty(owner) && "g".equalsIgnoreCase(owner)) {
+ goodsInfo.setShopType(21); // 浜笢鑷惀
if (labels == null) {
labels = new ArrayList<ClientTextStyleVO>();
}
@@ -438,8 +438,6 @@
textStyleVO.setContent("浜笢鑷惀");
textStyleVO.setColor("#E42219");
labels.add(textStyleVO);
- goodsInfo.setLabels(labels);
- goodsInfo.setShopType(21); // 浜笢鑷惀
} else {
goodsInfo.setShopType(20); // 浜笢
}
@@ -455,13 +453,13 @@
}
ClientTextStyleVO textStyleVO = new ClientTextStyleVO();
textStyleVO.setContent("鎷艰喘");
- textStyleVO.setColor("#FF9600");
+ textStyleVO.setColor("#E42219");
labels.add(textStyleVO);
- goodsInfo.setLabels(labels);
} else {
goodsInfo.setZkPrice(goods.getPrice());
goodsInfo.setPriceName("浜笢浠�");
}
+ goodsInfo.setLabels(labels);
// 搴楅摵淇℃伅
JDShopInfo shopInfo = goods.getShopInfo();
--
Gitblit v1.8.0