From f4548a3ee46afe45da4ee2a42dc169c575deee9f Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 31 七月 2019 11:57:36 +0800
Subject: [PATCH] 动态v2兼容
---
fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoUtil.java | 37 ++++++++++++++++---------------------
1 files changed, 16 insertions(+), 21 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoUtil.java
index 37c20f2..2296878 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoUtil.java
@@ -1,7 +1,6 @@
package com.yeshi.fanli.util.pinduoduo;
import java.io.UnsupportedEncodingException;
-import java.lang.reflect.Type;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.util.ArrayList;
@@ -19,17 +18,9 @@
import org.yeshi.utils.BigDecimalUtil;
import org.yeshi.utils.HttpUtil;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.reflect.TypeToken;
-import com.yeshi.fanli.dto.jd.JDCommissionInfo;
-import com.yeshi.fanli.dto.jd.JDCouponInfo;
-import com.yeshi.fanli.dto.jd.JDPingouInfo;
-import com.yeshi.fanli.dto.jd.JDShopInfo;
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
import com.yeshi.fanli.dto.pdd.PDDGoodsResult;
import com.yeshi.fanli.dto.pdd.PDDSearchFilter;
-import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
@@ -50,7 +41,7 @@
BigDecimal hundred = new BigDecimal(100);
rate = MoneyBigDecimalUtil.div(rate, hundred);
BigDecimal price = MoneyBigDecimalUtil.div(new BigDecimal(goods.getMinGroupPrice()), hundred).setScale(2);
- BigDecimal promotionRate = MoneyBigDecimalUtil.div(new BigDecimal(goods.getPromotionRate()),
+ BigDecimal promotionRate = MoneyBigDecimalUtil.div3(new BigDecimal(goods.getPromotionRate()),
new BigDecimal(1000));
Boolean hasCoupon = goods.getHasCoupon();
@@ -290,29 +281,33 @@
goods.setGoodsId(json.optLong("goodsId"));
goods.setGoodsName(json.optString("goodsName"));
goods.setGoodsDesc(json.optString("goodsDesc"));
- goods.setGoodsImageUrl(json.optString("goodsImageUrl"));
- goods.setGoodsThumbnailUrl(json.optString("goodsThumbnailUrl"));
goods.setSalesTip(json.optString("salesTip"));
- goods.setCategoryName(json.optString("categoryName"));
- goods.setHasCoupon(json.optBoolean("hasCoupon"));
+
+ if (json.optString("goodsImageUrl") != null) {
+ goods.setGoodsImageUrl("http:" + json.optString("goodsImageUrl"));
+ }
+
+ if (json.optString("goodsThumbnailUrl") != null) {
+ goods.setGoodsThumbnailUrl("http:" + json.optString("goodsThumbnailUrl"));
+ }
if (json.optString("minGroupPrice") != null) {
- goods.setMinGroupPrice(json.getLong("minGroupPrice"));
+ goods.setMinGroupPrice(json.getLong("minGroupPrice")/10);
}
+
if (json.optString("categoryId") != null) {
goods.setCategoryId(json.getLong("categoryId"));
}
+ goods.setCategoryName(json.optString("categoryName"));
+ goods.setHasCoupon(json.optBoolean("hasCoupon"));
+
if (json.optString("couponMinOrderAmount") != null) {
- goods.setCouponMinOrderAmount(json.getLong("couponMinOrderAmount"));
+ goods.setCouponMinOrderAmount(json.getLong("couponMinOrderAmount")/10);
}
if (json.optString("couponDiscount") != null) {
- goods.setCouponDiscount(json.getLong("couponDiscount"));
- }
-
- if (json.optString("couponDiscount") != null) {
- goods.setMinNormalPrice(json.getLong("couponDiscount"));
+ goods.setCouponDiscount(json.getLong("couponDiscount")/10);
}
if (json.optString("couponTotalQuantity") != null) {
--
Gitblit v1.8.0