From dc5be7d38446f70e6ff86df311119c32b41fe7f8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 28 十一月 2020 16:37:05 +0800
Subject: [PATCH] 大淘客搜索接口升级

---
 fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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 7f7aef1..0b0218d 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
@@ -42,8 +42,8 @@
 import com.yeshi.fanli.dto.jd.JDShopInfo;
 import com.yeshi.fanli.entity.jd.JDGoods;
 import com.yeshi.fanli.log.LogHelper;
-import com.yeshi.fanli.tag.PageEntity;
-import com.yeshi.fanli.util.MoneyBigDecimalUtil;
+import com.yeshi.common.entity.PageEntity;
+import org.yeshi.utils.MoneyBigDecimalUtil;
 import com.yeshi.fanli.util.StringUtil;
 
 import net.sf.json.JSONArray;
@@ -907,7 +907,7 @@
 			Comparator<JDCouponInfo> cm = new Comparator<JDCouponInfo>() {
 				@Override
 				public int compare(JDCouponInfo o1, JDCouponInfo o2) {
-					return o1.getQuota().compareTo(o2.getQuota());
+					return o1.getQuota().compareTo(o2.getQuota())==0?o1.getDiscount().compareTo(o2.getDiscount()):o1.getQuota().compareTo(o2.getQuota());
 				}
 			};
 			Collections.sort(couponInfoList, cm);

--
Gitblit v1.8.0