From 4f7ce4b7d2ad52f118c13e0f9f6fb2efd5b296ff Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 31 十月 2019 16:10:45 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/MoneyBigDecimalUtil.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/MoneyBigDecimalUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/MoneyBigDecimalUtil.java
index 9f7f481..da75418 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/MoneyBigDecimalUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/MoneyBigDecimalUtil.java
@@ -21,9 +21,13 @@
}
public static BigDecimal div(BigDecimal d1, BigDecimal d2) {// 杩涜闄ゆ硶杩愮畻
- return d1.divide(d2).setScale(2, BigDecimal.ROUND_DOWN);
+ return d1.divide(d2,2, BigDecimal.ROUND_DOWN);
}
+ public static BigDecimal div3(BigDecimal d1, BigDecimal d2) {// 杩涜闄ゆ硶杩愮畻
+ return d1.divide(d2, 3, BigDecimal.ROUND_DOWN);
+ }
+
public static BigDecimal getWithNoZera(BigDecimal num) {// 杩涜闄ゆ硶杩愮畻
while (num.toString().endsWith("0") && num.toString().indexOf(".") > -1) {
num = new BigDecimal(num.toString().substring(0, num.toString().length()-1));
--
Gitblit v1.8.0