From 78472da3395d1db45b6a76688c72a2c2a372c47a Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 31 Jul 2021 17:42:05 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger

---
 zq-erp/src/main/java/com/matrix/system/hive/plugin/util/MoneyUtil.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/plugin/util/MoneyUtil.java b/zq-erp/src/main/java/com/matrix/system/hive/plugin/util/MoneyUtil.java
index 3b5af52..7c9f166 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/plugin/util/MoneyUtil.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/plugin/util/MoneyUtil.java
@@ -62,7 +62,7 @@
 		v2=v2==null ? 0:v2;
 		BigDecimal b1 = new BigDecimal(Double.toString(v1));
 		BigDecimal b2 = new BigDecimal(Double.toString(v2));
-		return b1.multiply(b2).doubleValue();
+		return b1.multiply(b2).setScale(2,BigDecimal.ROUND_DOWN).doubleValue();
 	}
 
 
@@ -104,7 +104,7 @@
 	
 		BigDecimal b1 = new BigDecimal(Double.toString(v1));
 		BigDecimal b2 = new BigDecimal(Double.toString(v2));
-		return b1.divide(b2, scale, BigDecimal.ROUND_HALF_DOWN).doubleValue();
+		return b1.divide(b2, scale, BigDecimal.ROUND_DOWN).doubleValue();
 	}
 
 	/**

--
Gitblit v1.9.1