From 6b1a7a75b06eafb0bbf7f20d950384a3fde4c8ef Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 10 七月 2019 17:27:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
index 7e01b1c..110b1a1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
@@ -705,6 +705,8 @@
tg.setReservePrice(tb.getReservePrice());
tg.setUserType(tb.getUserType());
tg.setShopTitle(tb.getShopTitle());
+ tg.setTkRate(tb.getTkRate());
+ tg.setSellerId(tb.getSellerId());
tg.setState(tb.getState()); // 鐘舵�侊細2018-12-03
if (tb.getCouponAmount().compareTo(BigDecimal.valueOf(0)) > 0) {
@@ -767,13 +769,13 @@
tg.setSalesType(1);
// 娴嬭瘯浣跨敤
// tg.setSalesType(Math.random() > 0.5 ? tg.getSalesType() : 3);
- if(Constant.IS_TEST)
- {
- List<ClientTextStyleVO> labels = new ArrayList<>();
- labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#F14242"));
- labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#00FF00"));
- tg.setLabels(labels);
- }
+// if(Constant.IS_TEST)
+// {
+// List<ClientTextStyleVO> labels = new ArrayList<>();
+// labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#F14242"));
+// labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#00FF00"));
+// tg.setLabels(labels);
+// }
return tg;
}
@@ -1713,10 +1715,16 @@
taoBaoGoods.setCouponLeftCount(detail.getCouponTotalNum() - detail.getCouponReceiveNum());
else
taoBaoGoods.setCouponLeftCount(0);
- taoBaoGoods.setCouponStartFee(new BigDecimal(detail.getCouponConditions()));
+ taoBaoGoods.setCouponStartFee(detail.getOriginalPrice());
taoBaoGoods.setCouponTotalCount(detail.getCouponTotalNum());
taoBaoGoods.setPictUrl(detail.getMainPic());
taoBaoGoods.setPictUrlWhite(detail.getMainPic());
+ if (taoBaoGoods.getPictUrl() != null && !taoBaoGoods.getPictUrl().startsWith("http"))
+ taoBaoGoods.setPictUrl("https:" + taoBaoGoods.getPictUrl());
+
+ if (taoBaoGoods.getPictUrlWhite() != null && !taoBaoGoods.getPictUrlWhite().startsWith("http"))
+ taoBaoGoods.setPictUrlWhite("https:" + taoBaoGoods.getPictUrlWhite());
+
taoBaoGoods.setSellerId(detail.getSellerId());
taoBaoGoods.setShopTitle(detail.getShopName());
taoBaoGoods.setTitle(detail.getDtitle());
--
Gitblit v1.8.0