From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/MoneyBigDecimalUtil.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 da75418..17523a0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/MoneyBigDecimalUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/MoneyBigDecimalUtil.java
@@ -21,16 +21,20 @@
}
public static BigDecimal div(BigDecimal d1, BigDecimal d2) {// 杩涜闄ゆ硶杩愮畻
- return d1.divide(d2,2, BigDecimal.ROUND_DOWN);
+ return d1.divide(d2, 2, BigDecimal.ROUND_DOWN);
+ }
+
+ public static BigDecimal divUp(BigDecimal d1, BigDecimal d2) {// 杩涜闄ゆ硶杩愮畻
+ return d1.divide(d2, 2, BigDecimal.ROUND_UP);
}
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));
+ num = new BigDecimal(num.toString().substring(0, num.toString().length() - 1));
return getWithNoZera(num);
}
return num;
--
Gitblit v1.8.0