From c8041ec0544bf122e6819e6bf698997ccbf30aaf Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 10 十二月 2019 15:32:34 +0800
Subject: [PATCH] 小黄条

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
index 5bb3509..70d6918 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
@@ -498,6 +498,12 @@
 			otherInfo.setReduceHongBao(newUserHongBao);
 			goodsDetail.setOtherInfo(otherInfo);
 			
+			// 涓撳睘鏍囩
+			List<ClientTextStyleVO> labels = new ArrayList<ClientTextStyleVO>();
+			labels.add(new ClientTextStyleVO("鏂颁汉涓撳睘", "#FE0014"));
+			labels.add(new ClientTextStyleVO("瀹炰粯0鍏�", "#FF9600"));
+			goodsDetail.setLabels(labels);
+			
 		} else {// 鏅�氳喘涔�
 			OtherInfo otherInfo = new OtherInfo();
 			RewardCouponVO rewardCoupon = new RewardCouponVO();
@@ -1334,14 +1340,14 @@
 		if (jdGoodsList.size() > 0) {
 			List<JDGoods> goodsList = JDApiUtil.getGoodsDetail(jdGoodsList);
 			for (JDGoods goods : goodsList) {
-				tempGoodsList.put(goods.getSkuId() + "-" + Constant.SOURCE_TYPE_TAOBAO,
+				tempGoodsList.put(goods.getSkuId() + "-" + Constant.SOURCE_TYPE_JD,
 						GoodsDetailVOFactory.convertJDGoods(goods, params));
 			}
 		}
 		if (pddGoodsList.size() > 0) {
 			List<PDDGoodsDetail> goodsList = PinDuoDuoApiUtil.listGoodsDetail(pddGoodsList);
 			for (PDDGoodsDetail goods : goodsList) {
-				tempGoodsList.put(goods.getGoodsId() + "-" + Constant.SOURCE_TYPE_TAOBAO,
+				tempGoodsList.put(goods.getGoodsId() + "-" + Constant.SOURCE_TYPE_PDD,
 						GoodsDetailVOFactory.convertPDDGoods(goods, params));
 			}
 		}

--
Gitblit v1.8.0