From e1a62ec62e7331d97af9302e90e1ce44af8235eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 一月 2021 15:26:55 +0800
Subject: [PATCH] 拼多多授权绑定
---
fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 da4e698..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;
@@ -638,7 +638,7 @@
* @return
*/
public static String getJDGoodsIdByWeiXin(String url) {
- if (StringUtil.isNullOrEmpty(url))
+ if (StringUtil.isNullOrEmpty(url) || url.indexOf("jd.com") < 0)
return null;
try {
@@ -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