From ee88b54979c633a4ade518d4c124a2d07d378562 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 11 十月 2019 10:56:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java |    4 ++--
 1 files changed, 2 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 9e17cc5..39cb1cf 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
@@ -399,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) {

--
Gitblit v1.8.0