From 271ae63c20fcbe28d29c47f1881138ff6551a2a1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 六月 2020 19:26:26 +0800
Subject: [PATCH] 唯品会订单bug修复，APP端佣金比例展示错误bug修复
---
fanli/src/main/java/com/yeshi/fanli/util/suning/SuningUtil.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/suning/SuningUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/suning/SuningUtil.java
index 2cd2165..f0a5d26 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/suning/SuningUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/suning/SuningUtil.java
@@ -14,7 +14,7 @@
BigDecimal hundred = new BigDecimal(100);
rate = MoneyBigDecimalUtil.div(rate, hundred);
-
+
String commodityPrice = goods.getCommodityInfo().getCommodityPrice();
if (StringUtil.isNullOrEmpty(commodityPrice)) {
commodityPrice = goods.getCommodityInfo().getSnPrice();
@@ -23,14 +23,19 @@
BigDecimal afterUseCouponPrice = new BigDecimal(commodityPrice);
if (goods.getCouponInfo() != null && !StringUtil.isNullOrEmpty(goods.getCouponInfo().getCouponUrl())) {
// 鏈夊埜
- BigDecimal startPrice = new BigDecimal(goods.getCouponInfo().getBounsLimit());
+ BigDecimal startPrice = null;
+ if (StringUtil.isNullOrEmpty(goods.getCouponInfo().getBounsLimit())) {
+ startPrice = new BigDecimal(goods.getCouponInfo().getCouponValue());
+ } else
+ startPrice = new BigDecimal(goods.getCouponInfo().getBounsLimit());
if (afterUseCouponPrice.compareTo(startPrice) >= 0) {
- afterUseCouponPrice = afterUseCouponPrice.subtract(startPrice);
+ afterUseCouponPrice = afterUseCouponPrice.subtract(new BigDecimal(goods.getCouponInfo().getCouponValue()));
}
}
+
+ BigDecimal commission=MoneyBigDecimalUtil.mul(afterUseCouponPrice,MoneyBigDecimalUtil.div(new BigDecimal(goods.getCommodityInfo().getRate()), new BigDecimal(100),5));
- BigDecimal money = MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil.div(
- afterUseCouponPrice.multiply(new BigDecimal(goods.getCommodityInfo().getRate())), new BigDecimal(100)),
+ BigDecimal money = MoneyBigDecimalUtil.mul(commission,
rate);
return BigDecimalUtil.getWithNoZera(money).setScale(2);
}
--
Gitblit v1.8.0