From 48ef443170ee0cc12268bda0c686ffbd1d81671c Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 02 一月 2024 14:26:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/core/utils/CurrencyUtil.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/core/utils/CurrencyUtil.java b/consum-base/src/main/java/com/consum/base/core/utils/CurrencyUtil.java
index 3c56920..5d206c3 100644
--- a/consum-base/src/main/java/com/consum/base/core/utils/CurrencyUtil.java
+++ b/consum-base/src/main/java/com/consum/base/core/utils/CurrencyUtil.java
@@ -8,20 +8,22 @@
public class CurrencyUtil {
public static BigDecimal convertFenToYuan(long price) {
- return new BigDecimal(price).divide(new BigDecimal(100));
+ return new BigDecimal(price).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_DOWN);
}
- public static Integer convertFenToYuan(Integer price) {
+
+ public static double convertFenToYuan(Integer price) {
if (price == null) {
- return null;
+ return 0;
}
- return new BigDecimal(price).divide(new BigDecimal(100)).intValueExact();
+ return new BigDecimal(price).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_DOWN).doubleValue();
}
- public static BigDecimal convertFenToYuan(BigDecimal price) {
+
+ public static double convertFenToYuan(Double price) {
if (price == null) {
- return null;
+ return 0;
}
- return price.divide(new BigDecimal(100));
+ return BigDecimal.valueOf(price).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_DOWN).doubleValue();
}
}
--
Gitblit v1.9.1