From e1a62ec62e7331d97af9302e90e1ce44af8235eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 一月 2021 15:26:55 +0800
Subject: [PATCH] 拼多多授权绑定

---
 fanli/src/main/java/com/yeshi/fanli/util/CommonGoodsUtil.java |   11 ++++++++++-
 1 files changed, 10 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..6444185 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/CommonGoodsUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/CommonGoodsUtil.java
@@ -8,6 +8,7 @@
 
 import com.yeshi.fanli.entity.goods.CommonGoods;
 import com.yeshi.fanli.util.taobao.TaoBaoCouponUtil;
+import org.yeshi.utils.MoneyBigDecimalUtil;
 
 @Component
 public class CommonGoodsUtil {
@@ -34,9 +35,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 +57,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