From b7b8f2a4fe9059ef7b5470a68bb1b34787bc92b2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 25 六月 2019 09:14:46 +0800
Subject: [PATCH] 淘礼金相关
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java | 22 ++--------------------
1 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java
index 4c74dc1..efc60fb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java
@@ -518,35 +518,17 @@
}
public static TaoBaoGoodsBrief filterTaoBaoGoods(TaoBaoGoodsBrief goods, DaTaoKeDetail detail) {
- if (detail != null) {
+ if (detail != null && goods != null) {
// 閲嶆柊璁剧疆鏍囬涓庡埜浠锋牸
goods.setTitle(detail.getdTitle());
- if (goods.getCouponAmount() != null && detail.getQuanPrice() != null
- && goods.getCouponAmount().compareTo(detail.getQuanPrice()) < 0)
- goods.setCouponAmount(detail.getQuanPrice());
- goods.setZkPrice(detail.getOrgPrice());
- if (new BigDecimal(detail.getQuanCondition()).compareTo(new BigDecimal(0)) > 0)
- goods.setCouponInfo(String.format("婊�%s鍏冨噺%s鍏�", detail.getQuanCondition(),
- MoneyBigDecimalUtil.getWithNoZera(goods.getCouponAmount()).toString()));
- else
- goods.setCouponInfo(String.format("%s鍏冩棤鏉′欢鍒�", goods.getCouponAmount()));
}
return goods;
}
public static TaoBaoGoodsBrief filterTaoBaoGoods(TaoBaoGoodsBrief goods, DaTaoKeDetailV2 detail) {
- if (detail != null) {
+ if (detail != null && goods != null) {
// 閲嶆柊璁剧疆鏍囬涓庡埜浠锋牸
goods.setTitle(detail.getDtitle());
- if (goods.getCouponAmount() != null && detail.getCouponPrice() != null
- && goods.getCouponAmount().compareTo(detail.getCouponPrice()) < 0)
- goods.setCouponAmount(detail.getCouponPrice());
- goods.setZkPrice(detail.getOriginalPrice());
- if (new BigDecimal(detail.getCouponConditions()).compareTo(new BigDecimal(0)) > 0)
- goods.setCouponInfo(String.format("婊�%s鍏冨噺%s鍏�", detail.getCouponConditions(),
- MoneyBigDecimalUtil.getWithNoZera(goods.getCouponAmount()).toString()));
- else
- goods.setCouponInfo(String.format("%s鍏冩棤鏉′欢鍒�", goods.getCouponAmount()));
}
return goods;
}
--
Gitblit v1.8.0