From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:28:03 +0800
Subject: [PATCH] Merge branch 'div_12'
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 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 c1e1d34..fe21a3b 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
@@ -51,6 +51,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
import com.yeshi.fanli.entity.taobao.TaoBaoShop;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
+import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.goods.TaoBaoLinkService;
@@ -762,8 +763,8 @@
tg.setSalesType(Math.random() > 0.5 ? 1 : 2);
tg.setSalesType(Math.random() > 0.5 ? tg.getSalesType() : 3);
List<ClientTextStyleVO> labels = new ArrayList<>();
- labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭1", "#FF0000"));
- labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭2", "#00FF00"));
+ labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭", "#FF0000"));
+ labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭", "#00FF00"));
tg.setLabels(labels);
return tg;
@@ -1014,8 +1015,8 @@
tg.setSalesType(Math.random() > 0.5 ? 1 : 2);
tg.setSalesType(Math.random() > 0.5 ? tg.getSalesType() : 3);
List<ClientTextStyleVO> labels = new ArrayList<>();
- labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭1", "#FF0000"));
- labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭2", "#00FF00"));
+ labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭", "#FF0000"));
+ labels.add(new ClientTextStyleVO("鏍囩娴嬭瘯鍐呭", "#00FF00"));
tg.setLabels(labels);
return tg;
@@ -1329,10 +1330,11 @@
* @return
*/
public static String getGoodsHongBaoInfo(TaoBaoGoodsBrief goodsBrief, BigDecimal rate) {
-// if (goodsBrief != null && goodsBrief.getMaterialLibType() != null && goodsBrief.getMaterialLibType() == 0)
-// return "楼0.00";
-// else
- return "楼" + getGoodsHongBaoMoney(goodsBrief, rate).toString();
+ // if (goodsBrief != null && goodsBrief.getMaterialLibType() != null &&
+ // goodsBrief.getMaterialLibType() == 0)
+ // return "楼0.00";
+ // else
+ return "楼" + getGoodsHongBaoMoney(goodsBrief, rate).toString();
}
/**
@@ -1688,6 +1690,29 @@
return taoBaoGoods;
}
+ public static TaoBaoGoodsBrief convert(DaTaoKeDetail detail) {
+ TaoBaoGoodsBrief taoBaoGoods = new TaoBaoGoodsBrief();
+ taoBaoGoods.setAuctionId(detail.getGoodsId());
+ taoBaoGoods.setBiz30day(detail.getSalesNum());
+ taoBaoGoods.setCouponAmount(detail.getQuanPrice());
+ taoBaoGoods.setCouponInfo(String.format("婊�%s鍏冨噺%s鍏�", detail.getQuanCondition(),
+ MoneyBigDecimalUtil.getWithNoZera(detail.getQuanPrice())));
+ taoBaoGoods.setCouponLeftCount(detail.getQuanSurplus());
+ taoBaoGoods.setCouponStartFee(new BigDecimal(detail.getQuanCondition()));
+ taoBaoGoods.setCouponTotalCount(detail.getQuanSurplus());
+ taoBaoGoods.setPictUrl(detail.getPic());
+ taoBaoGoods.setPictUrlWhite(detail.getPic());
+ taoBaoGoods.setSellerId(detail.getSellerId());
+ taoBaoGoods.setShopTitle("");
+ taoBaoGoods.setTitle(detail.getdTitle());
+ taoBaoGoods.setUserType(detail.getIsTmall());
+ taoBaoGoods.setZkPrice(detail.getOrgPrice());
+ taoBaoGoods.setTkRate(detail.getCommission());
+ taoBaoGoods.setTkCommFee(new BigDecimal("0"));
+ taoBaoGoods.setState(0);
+ return taoBaoGoods;
+ }
+
/**
* 鑾峰彇娣樺疂鑱旂洘鐨勬巿鏉冮摼鎺�
*
--
Gitblit v1.8.0