From a1175313094799efcdbbecf2840a90350d3159a7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 29 七月 2019 18:02:30 +0800
Subject: [PATCH] 首页加入缓存

---
 fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java |   30 ++++++++++++++----------------
 1 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java
index 335a380..95478cd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java
@@ -275,12 +275,8 @@
 		shopInfo.setShopId(json.optInt("shopId"));
 		shopInfo.setShopName(json.optString("shopName"));
 		goods.setShopInfo(shopInfo);
-
-		if (!StringUtil.isNullOrEmpty(json.optString("wlPrice")))
-			goods.setPrice(new BigDecimal(json.optString("wlPrice")));
-		else
-			goods.setPrice(new BigDecimal(json.optString("finalPrice")));
-		
+		goods.setPrice(new BigDecimal(json.optString("wlPrice")));
+	
 		goods.setInOrderCount30Days(json.optLong("inOrderCount30Days"));
 		
 		if (json.optInt("isZY") == 1)
@@ -296,16 +292,6 @@
 		goods.setCommissionInfo(commission);
 		goods.setGoodCommentsShare(new BigDecimal(json.optString("goodCommentsShare")));
 
-		// 鍒镐俊鎭�
-		if (json.optString("hasCoupon") != null && json.optInt("hasCoupon") == 1
-				&& json.optInt("couponRemainCnt") > 0) {
-			JDCouponInfo coupon = new JDCouponInfo();
-			coupon.setDiscount(new BigDecimal(json.optString("couponDiscount")));
-			coupon.setQuota(new BigDecimal(json.optString("couponQuota")));
-			coupon.setLink("https:" + json.optString("couponLink"));
-			goods.setCouponInfo(coupon);
-		} 
-		
 		// 鍥㈣喘淇℃伅
 		if (json.optString("isPinGou") != null && json.optInt("isPinGou") == 1) {
 			JDPingouInfo jdPinGouInfo = new JDPingouInfo();
@@ -314,6 +300,18 @@
 			goods.setPinGouInfo(jdPinGouInfo);
 		} 
 		
+		
+		// 鍒镐俊鎭�
+		BigDecimal finalPrice = new BigDecimal(json.optString("finalPrice"));
+		if (finalPrice != null && json.optString("hasCoupon") != null && json.optInt("hasCoupon") == 1
+				&& json.optInt("couponRemainCnt") > 0) {
+			JDCouponInfo coupon = new JDCouponInfo();
+			coupon.setDiscount(new BigDecimal(json.optString("couponDiscount")));
+			coupon.setQuota(new BigDecimal(json.optString("couponQuota")));
+			coupon.setLink("https:" + json.optString("couponLink"));
+			goods.setCouponInfo(coupon);
+		} 
+		
 		return goods;
 	}
 	

--
Gitblit v1.8.0