From d4c19062530c46203b0950b20e66afdeefcdf3a6 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期一, 10 十二月 2018 14:13:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java | 30 +++---------------------------
1 files changed, 3 insertions(+), 27 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 cf19d2b..f86d7fa 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
@@ -683,8 +683,7 @@
return list;
}
- public static TaoBaoGoodsBriefExtra getTaoBaoGoodsBriefExtra(TaoBaoGoodsBrief tb, String proportion,
- String fcRateStr, String pid) {
+ public static TaoBaoGoodsBriefExtra getTaoBaoGoodsBriefExtra(TaoBaoGoodsBrief tb, String proportion, String pid) {
TaoBaoGoodsBriefExtra tg = new TaoBaoGoodsBriefExtra();
tg.setId(tb.getId());
tg.setAuctionId(tb.getAuctionId());
@@ -715,17 +714,6 @@
tg.setTaoBaoQuanInfo(quanInfo);
}
TaoBaoHongBaoInfo hongBaoInfo = new TaoBaoHongBaoInfo();
- BigDecimal fcRate = BigDecimal.valueOf(1);
- String eventRate = tb.getEventRate();
- BigDecimal rate = BigDecimal.valueOf(0);
- if (eventRate == null) {
- rate = tb.getTkRate();
- } else {
- rate = new BigDecimal(eventRate);
- if (fcRateStr != null) {
- fcRate = (new BigDecimal(fcRateStr).divide(BigDecimal.valueOf(100)));
- }
- }
hongBaoInfo.setRate("鏈�楂�40%");
@@ -965,19 +953,8 @@
tg.setTaoBaoQuanInfo(quanInfo);
}
- Map<String, String> convertMap = taoBaoUtil.manageService.convertMap();
- String proportion = convertMap.get("hongbao_goods_proportion");
- String fcRateStr = convertMap.get("hongbao_fc_ratio");
+ BigDecimal proportion = taoBaoUtil.manageService.getFanLiRate();
TaoBaoHongBaoInfo hongBaoInfo = new TaoBaoHongBaoInfo();
- String eventRate = tb.getEventRate();
- BigDecimal rate = BigDecimal.valueOf(0);
- if (eventRate != null) {
- rate = new BigDecimal(eventRate);
- } else {
- rate = tb.getTkRate();
- }
- BigDecimal fcRate = new BigDecimal(fcRateStr);
-
String tkMktStatus = tb.getTkMktStatus();
if ("1".equals(tkMktStatus)) {
hongBaoInfo.setType(1);
@@ -985,7 +962,7 @@
hongBaoInfo.setRate("鏈�楂�40%");
- String hongbao = getGoodsHongBaoInfo(tb, new BigDecimal(proportion));
+ String hongbao = getGoodsHongBaoInfo(tb, proportion);
if (!hongbao.contains("鏈�楂�"))
hongBaoInfo.setHongbao(new BigDecimal(hongbao.replace("楼", "")));
else
@@ -1401,7 +1378,6 @@
BigDecimal finalPrice = goodsBrief.getZkPrice().subtract(couponAccount);
return finalPrice.multiply(goodsBrief.getTkRate()).divide(new BigDecimal(10000)).multiply(rate)
.setScale(2, BigDecimal.ROUND_DOWN);
-
} else {// 涓嶈兘鐢ㄥ埜
return goodsBrief.getZkPrice().multiply(goodsBrief.getTkRate()).divide(new BigDecimal(10000))
.multiply(rate).setScale(2, BigDecimal.ROUND_DOWN);
--
Gitblit v1.8.0