From 1be32ab61d7ed248f190eead478bdd7f8b83edbe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 29 七月 2019 18:26:19 +0800
Subject: [PATCH] 添加判断京东/拼多多是否参与推广
---
fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 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 a83b95b..95478cd 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
@@ -139,6 +139,7 @@
String key = searchFilter.getKey();
if (StringUtil.isNullOrEmpty(key)) {
+ data.put("key", "");
data.put("keywordType", "kt0");
data.put("searchType", "st3");
} else {
@@ -274,12 +275,8 @@
shopInfo.setShopId(json.optInt("shopId"));
shopInfo.setShopName(json.optString("shopName"));
goods.setShopInfo(shopInfo);
-
- if (!StringUtil.isNullOrEmpty(json.optString("wlPrice")))
- goods.setPrice(new BigDecimal(json.optString("wlPrice")));
- else
- goods.setPrice(new BigDecimal(json.optString("finalPrice")));
-
+ goods.setPrice(new BigDecimal(json.optString("wlPrice")));
+
goods.setInOrderCount30Days(json.optLong("inOrderCount30Days"));
if (json.optInt("isZY") == 1)
@@ -295,16 +292,6 @@
goods.setCommissionInfo(commission);
goods.setGoodCommentsShare(new BigDecimal(json.optString("goodCommentsShare")));
- // 鍒镐俊鎭�
- if (json.optString("hasCoupon") != null && json.optInt("hasCoupon") == 1
- && json.optInt("couponRemainCnt") > 0) {
- JDCouponInfo coupon = new JDCouponInfo();
- coupon.setDiscount(new BigDecimal(json.optString("couponDiscount")));
- coupon.setQuota(new BigDecimal(json.optString("couponQuota")));
- coupon.setLink("https:" + json.optString("couponLink"));
- goods.setCouponInfo(coupon);
- }
-
// 鍥㈣喘淇℃伅
if (json.optString("isPinGou") != null && json.optInt("isPinGou") == 1) {
JDPingouInfo jdPinGouInfo = new JDPingouInfo();
@@ -313,6 +300,18 @@
goods.setPinGouInfo(jdPinGouInfo);
}
+
+ // 鍒镐俊鎭�
+ BigDecimal finalPrice = new BigDecimal(json.optString("finalPrice"));
+ if (finalPrice != null && json.optString("hasCoupon") != null && json.optInt("hasCoupon") == 1
+ && json.optInt("couponRemainCnt") > 0) {
+ JDCouponInfo coupon = new JDCouponInfo();
+ coupon.setDiscount(new BigDecimal(json.optString("couponDiscount")));
+ coupon.setQuota(new BigDecimal(json.optString("couponQuota")));
+ coupon.setLink("https:" + json.optString("couponLink"));
+ goods.setCouponInfo(coupon);
+ }
+
return goods;
}
--
Gitblit v1.8.0