From 5f01b1bf63bd3dd242fc29e012e15c37fc03a190 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 10 十二月 2018 17:30:17 +0800
Subject: [PATCH] 分享赚比例修改 增加单品的分享记录
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java | 60 +++++++++++++++++++-----------------------------------------
1 files changed, 19 insertions(+), 41 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 2507ddf..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
@@ -1060,7 +1037,6 @@
}
return tb;
}
-
public static ScanHistory getScanHistory(TaoBaoGoodsBrief tb) {
ScanHistory sh = new ScanHistory();
@@ -1367,8 +1343,6 @@
return taoBaoGoodsBrief;
}
-
-
/**
* 鑾峰彇鍟嗗搧鐨勭敤鎴峰垎鎴愭瘮渚�
*
@@ -1379,17 +1353,21 @@
* @return
*/
public static String getGoodsHongBaoInfo(TaoBaoGoodsBrief goodsBrief, BigDecimal rate) {
- // 钀ラ攢璁″垝
- // if ("1".equalsIgnoreCase(goodsBrief.getTkMktStatus())) {
- // return "鏈�楂�40%";
- // } else {
- // 璁＄畻杩斿埄
- // 鏃犲埜
+ return "楼" + getGoodsHongBaoMoney(goodsBrief, rate).toString();
+ }
+
+ /**
+ * 鑾峰彇娣樺疂鍟嗗搧璇ヨ幏寰楀灏戜剑閲�
+ *
+ * @param goodsBrief
+ * @param rate
+ * @return
+ */
+ public static BigDecimal getGoodsHongBaoMoney(TaoBaoGoodsBrief goodsBrief, BigDecimal rate) {
if (StringUtil.isNullOrEmpty(goodsBrief.getCouponInfo())
|| goodsBrief.getCouponInfo().trim().equalsIgnoreCase("鏃�")) {
- return "楼" + goodsBrief.getZkPrice().multiply(goodsBrief.getTkRate()).divide(new BigDecimal(10000))
- .multiply(rate).setScale(2, BigDecimal.ROUND_DOWN);
-
+ return goodsBrief.getZkPrice().multiply(goodsBrief.getTkRate()).divide(new BigDecimal(10000)).multiply(rate)
+ .setScale(2, BigDecimal.ROUND_DOWN);
} else// 鏈夊埜
{
List<BigDecimal> list = TaoBaoCouponUtil.getCouponInfo(goodsBrief.getCouponInfo());
@@ -1398,15 +1376,15 @@
if (startFee.compareTo(goodsBrief.getZkPrice()) <= 0
&& goodsBrief.getZkPrice().compareTo(couponAccount) > 0) {
BigDecimal finalPrice = goodsBrief.getZkPrice().subtract(couponAccount);
- return "楼" + finalPrice.multiply(goodsBrief.getTkRate()).divide(new BigDecimal(10000)).multiply(rate)
+ 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))
+ return goodsBrief.getZkPrice().multiply(goodsBrief.getTkRate()).divide(new BigDecimal(10000))
.multiply(rate).setScale(2, BigDecimal.ROUND_DOWN);
}
}
}
+
// }
// 鑾峰彇鍒哥殑绾㈠寘鏄剧ず
--
Gitblit v1.8.0