From 0cc3b905e5945d1b4b02ee5f91a615bcfd8f08d6 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 25 七月 2019 11:44:10 +0800
Subject: [PATCH] 京东兼容

---
 fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java
index 9c9c3e0..ea72abc 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java
@@ -16,6 +16,7 @@
 
 import com.google.gson.Gson;
 import com.yeshi.fanli.dto.jd.JDCouponInfo;
+import com.yeshi.fanli.dto.jd.JDPingouInfo;
 import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
 import com.yeshi.fanli.entity.accept.AcceptData;
 import com.yeshi.fanli.entity.bus.recommend.RecommendBanner;
@@ -461,11 +462,20 @@
 		String materialId = "https://item.jd.com/" + id + ".html";
 		String jumpLink = JDApiUtil.convertLink(materialId, couponUrl, JDApiUtil.POSITION_SHARE + "", uid);
 		
+		int priceType = 1;
+		BigDecimal price = jdGoods.getPrice();;
+		JDPingouInfo pinGouInfo = jdGoods.getPinGouInfo();
+		if (pinGouInfo != null) {
+			priceType = 2; // 鎷艰喘浠�
+			price =  pinGouInfo.getPingouPrice();
+		}
+		
 		JSONObject data = new JSONObject();
 		data.put("jdzy", jdzy);
 		data.put("imgs", imageList);
 		data.put("title", jdGoods.getSkuName());
-		data.put("zkPrice", jdGoods.getPrice());
+		data.put("zkPrice", price);
+		data.put("priceType", priceType); 
 		data.put("coupon", hasCoupon);
 		data.put("couponAmount", discount);
 		data.put("couponPrice", JDUtil.getQuanPrice(jdGoods));

--
Gitblit v1.8.0