From 8066bc39f3bdc5647352c77e7b7a41b7606162a5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 07 十二月 2018 17:20:59 +0800
Subject: [PATCH] 修改佣金计算
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 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..cf19d2b 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
@@ -1061,7 +1061,6 @@
return tb;
}
-
public static ScanHistory getScanHistory(TaoBaoGoodsBrief tb) {
ScanHistory sh = new ScanHistory();
Field[] fields = tb.getClass().getDeclaredFields();
@@ -1367,8 +1366,6 @@
return taoBaoGoodsBrief;
}
-
-
/**
* 鑾峰彇鍟嗗搧鐨勭敤鎴峰垎鎴愭瘮渚�
*
@@ -1379,17 +1376,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 +1399,16 @@
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