From 3ac30b4c17cf071ce9c66a59c069ab83efae6d2d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 14 十月 2019 17:44:13 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 6f6d8d6..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
@@ -132,6 +132,7 @@
JSONObject resultJson = JSONObject.fromObject(result);
result = resultJson.optJSONObject("jd_union_open_promotion_common_get_response").optString("result");
+ System.out.println(result);
if (result == null) {
return null;
}
@@ -398,8 +399,8 @@
if (discount_temp == null) {
add = true;
discount_temp = discount;
- } else if (discount_temp.compareTo(discount) > 0) { // 鍒搁潰棰濆ぇ
- add = true;
+ } else if (discount_temp.compareTo(discount) < 0 && discount.compareTo(price) <= 0) {
+ add = true; // 鍒搁潰棰濆ぇ,涓斿埜鑳藉浣跨敤
}
if (add) {
@@ -484,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