From 7e7db2fa55a9a3af46d4fd8ede0dee147f101d64 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 09 五月 2020 21:41:27 +0800
Subject: [PATCH] 2.1需求

---
 fanli/src/main/java/com/yeshi/fanli/util/MoneyBigDecimalUtil.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 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..9877202 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/MoneyBigDecimalUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/MoneyBigDecimalUtil.java
@@ -19,18 +19,30 @@
 	public static BigDecimal mul2(BigDecimal d1, BigDecimal d2) { // 杩涜涔樻硶杩愮畻
 		return d1.multiply(d2).setScale(2, BigDecimal.ROUND_DOWN);
 	}
+	
+	public static BigDecimal mul(BigDecimal d1, BigDecimal d2,int scale) { // 杩涜涔樻硶杩愮畻
+		return d1.multiply(d2).setScale(scale, BigDecimal.ROUND_DOWN);
+	}
 
 	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 div(BigDecimal d1, BigDecimal d2,int scale) {// 杩涜闄ゆ硶杩愮畻
+		return d1.divide(d2, scale, 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