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/CommonGoodsUtil.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/CommonGoodsUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/CommonGoodsUtil.java
index f6d1edd..c45e71f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/CommonGoodsUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/CommonGoodsUtil.java
@@ -34,9 +34,11 @@
 		BigDecimal money = null;
 
 		if (StringUtil.isNullOrEmpty(goods.getCouponInfo()) || goods.getCouponInfo().trim().equalsIgnoreCase("鏃�")) {
+			BigDecimal price = goods.getPrice();
 			money = MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil
-					.mul(MoneyBigDecimalUtil.mul(goods.getPrice(), goods.getRate()), new BigDecimal("0.01")),
+					.mul(MoneyBigDecimalUtil.mul(price, goods.getRate()), new BigDecimal("0.01")),
 					MoneyBigDecimalUtil.div(rate, new BigDecimal(100)));
+
 		} else// 鏈夊埜
 		{
 			List<BigDecimal> list = TaoBaoCouponUtil.getCouponInfo(goods.getCouponInfo());
@@ -54,6 +56,12 @@
 						MoneyBigDecimalUtil.div(rate, new BigDecimal(100)));
 			}
 		}
+		
+		if (goods.getGoodsType() == Constant.SOURCE_TYPE_VIP) {
+			money = MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil
+					.mul(MoneyBigDecimalUtil.mul(goods.getCouponStartPrice(), goods.getRate()), new BigDecimal("0.01")),
+					MoneyBigDecimalUtil.div(rate, new BigDecimal(100)));
+		}
 
 		// 浜笢鍟嗗搧鐗规畩澶勭悊
 		if (goods.getGoodsType() == Constant.SOURCE_TYPE_JD)

--
Gitblit v1.8.0