From 1e4e20573dfc917e7b43068da35ee532a192aacd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 一月 2020 15:09:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/CommonGoodsUtil.java | 55 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 15 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 37f7522..f6d1edd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/CommonGoodsUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/CommonGoodsUtil.java
@@ -11,9 +11,10 @@
@Component
public class CommonGoodsUtil {
-
+
/**
* 鍟嗗搧浣ｉ噾鍖呭惈楼绗﹀彿
+ *
* @param goods
* @param rate
* @return
@@ -21,10 +22,10 @@
public static String getCommissionInfo(CommonGoods goods, BigDecimal rate) {
return "楼" + getCommission(goods, rate).toString();
}
-
-
+
/**
- * 鍟嗗搧浣ｉ噾
+ * 鍟嗗搧浣ｉ噾
+ *
* @param goods
* @param rate
* @return
@@ -32,30 +33,54 @@
public static BigDecimal getCommission(CommonGoods goods, BigDecimal rate) {
BigDecimal money = null;
- if (StringUtil.isNullOrEmpty(goods.getCouponInfo())
- || goods.getCouponInfo().trim().equalsIgnoreCase("鏃�")) {
- money = MoneyBigDecimalUtil.mul(
- MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil.mul(goods.getPrice(), goods.getRate()),
- new BigDecimal("0.01")),
+ if (StringUtil.isNullOrEmpty(goods.getCouponInfo()) || goods.getCouponInfo().trim().equalsIgnoreCase("鏃�")) {
+ money = MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil
+ .mul(MoneyBigDecimalUtil.mul(goods.getPrice(), goods.getRate()), new BigDecimal("0.01")),
MoneyBigDecimalUtil.div(rate, new BigDecimal(100)));
} else// 鏈夊埜
{
List<BigDecimal> list = TaoBaoCouponUtil.getCouponInfo(goods.getCouponInfo());
BigDecimal startFee = list.get(0);
BigDecimal couponAccount = list.get(1);
- if (startFee.compareTo(goods.getPrice()) <= 0
- && goods.getPrice().compareTo(couponAccount) > 0) {
+ if (startFee.compareTo(goods.getPrice()) <= 0 && goods.getPrice().compareTo(couponAccount) > 0) {
BigDecimal finalPrice = goods.getPrice().subtract(couponAccount);
money = MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil
.mul(MoneyBigDecimalUtil.mul(finalPrice, goods.getRate()), new BigDecimal("0.01")),
MoneyBigDecimalUtil.div(rate, new BigDecimal(100)));
} else {// 涓嶈兘鐢ㄥ埜
- money = MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil.mul(
- MoneyBigDecimalUtil.mul(goods.getPrice(), goods.getRate()),
- new BigDecimal("0.01")), MoneyBigDecimalUtil.div(rate, new BigDecimal(100)));
+ money = MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil
+ .mul(MoneyBigDecimalUtil.mul(goods.getPrice(), goods.getRate()), new BigDecimal("0.01")),
+ MoneyBigDecimalUtil.div(rate, new BigDecimal(100)));
}
}
- return BigDecimalUtil.getWithNoZera(money);
+
+ // 浜笢鍟嗗搧鐗规畩澶勭悊
+ if (goods.getGoodsType() == Constant.SOURCE_TYPE_JD)
+ return BigDecimalUtil.getWithNoZera(MoneyBigDecimalUtil.mul(money, new BigDecimal("0.9")));
+ else
+ return BigDecimalUtil.getWithNoZera(money);
+ }
+
+ /**
+ * 璁＄畻鍟嗗搧鍒稿悗浠凤紝娌℃湁鍒稿垯杩斿洖鍘熶环
+ *
+ * @param goodsBrief
+ * @return
+ */
+ public static BigDecimal getAfterUseCouplePrice(CommonGoods goods) {
+ if (StringUtil.isNullOrEmpty(goods.getCouponInfo()) || "鏃�".equals(goods.getCouponInfo())) {
+ return goods.getPrice();
+ } else {
+ List<BigDecimal> list = TaoBaoCouponUtil.getCouponInfo(goods.getCouponInfo());
+ BigDecimal startFee = list.get(0);
+ BigDecimal couponAccount = list.get(1);
+ if (startFee.compareTo(goods.getPrice()) <= 0 && goods.getPrice().compareTo(couponAccount) > 0) {
+ BigDecimal finalPrice = goods.getPrice().subtract(couponAccount);
+ return finalPrice;
+ } else {// 涓嶈兘鐢ㄥ埜
+ return goods.getPrice();
+ }
+ }
}
}
--
Gitblit v1.8.0