From f27c390100838b75c468ce92330276b68e476ef5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 15 十月 2019 10:20:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java
index 39cb1cf..0ab6a23 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java
@@ -485,14 +485,17 @@
 		if (!StringUtil.isNullOrEmpty(isFreeShipping)) {
 			goods.setIsFreeShipping(Integer.parseInt(isFreeShipping));
 		}
-
+		String inOrderCount = json.optString("inOrderCount");
+		if (!StringUtil.isNullOrEmpty(isFreeShipping)) {
+			goods.setInOrderCount30Days(Long.parseLong(inOrderCount));
+		}
+		
 		goods.setCouponInfo(null);
 		goods.setGoodCommentsShare(null);
 		List<String> imageList = new ArrayList<>();
 		imageList.add(json.optString("imgUrl"));
 		goods.setPicUrl(json.optString("imgUrl"));
 		goods.setImageList(imageList);
-		goods.setInOrderCount30Days(0L);
 		goods.setIsHot(null);
 		goods.setMaterialUrl(json.optString("materialUrl"));
 		goods.setOwner(null);

--
Gitblit v1.8.0