From 0293e06edd011d6921ec2cc08392042f5765dfb8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 18 九月 2025 13:35:54 +0800
Subject: [PATCH] 日志修改
---
ruoyi-common/src/main/java/com/ruoyi/common/tax/TaxtUtils.java | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/tax/TaxtUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/tax/TaxtUtils.java
index 2389e95..a54caba 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/tax/TaxtUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/tax/TaxtUtils.java
@@ -8,6 +8,7 @@
import lombok.extern.slf4j.Slf4j;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.util.Collection;
import java.util.List;
@@ -31,32 +32,35 @@
*/
public static String getTaxation(BigDecimal money) {
//褰揦<=800鏃讹紝涓◣T=0
- BigDecimal taxMoney = new BigDecimal(0.0);
+ BigDecimal taxMoney = BigDecimal.valueOf(0.0);
//褰�800<X<=4000鏃讹紝涓◣T=(X-800)*20%
if (money.doubleValue() > 800 && money.doubleValue() <= 4000) {
BigDecimal subtract = money.subtract(new BigDecimal(800));
- taxMoney = subtract.multiply(new BigDecimal(0.2));
+ taxMoney = subtract.multiply(BigDecimal.valueOf(0.2));
}
- BigDecimal multiply = money.multiply(new BigDecimal(0.8));
+ BigDecimal multiply = money.multiply(BigDecimal.valueOf(0.8));
// 褰揦>4000鏃�
//(1)褰揦*(1-20%)<=20000鏃讹紝涓◣T=X*(1-20%)*20%
if (money.doubleValue() > 4000 && multiply.doubleValue() <= 20000) {
- taxMoney = multiply.multiply(new BigDecimal(0.2));
+ taxMoney = multiply.multiply(BigDecimal.valueOf(0.2));
}
//(2)褰�20000<X*(1-20%)<=50000鏃讹紝涓◣T=X*(1-20%)*30%-2000
if (multiply.doubleValue() > 20000 && multiply.doubleValue() <= 50000) {
- taxMoney = multiply.multiply(new BigDecimal(0.3)).subtract(new BigDecimal(2000));
+ taxMoney = multiply.multiply(BigDecimal.valueOf(0.3)).subtract(BigDecimal.valueOf(2000));
}
//X*(1-20%)>50000鏃讹紝涓◣T=X*(1-20%)*40%-7000
if (multiply.doubleValue() > 50000) {
- taxMoney = multiply.multiply(new BigDecimal(0.4)).subtract(new BigDecimal(7000));
+ taxMoney = multiply.multiply(BigDecimal.valueOf(0.4)).subtract(BigDecimal.valueOf(7000));
}
- DecimalFormat decimalFormat = new DecimalFormat("#.00");
+ DecimalFormat decimalFormat = new DecimalFormat("#0.00");
+ //杩涗竴娉�
+ decimalFormat.setRoundingMode(RoundingMode.CEILING);
String format = decimalFormat.format(taxMoney);
+ log.info("绋庨噾涓猴細{}", format);
return format;
}
@@ -68,31 +72,33 @@
*/
public static String getTaxationBefore(BigDecimal money) {
//褰揦<=800鏃讹紝涓◣T=0
- BigDecimal taxMoney = new BigDecimal(0.0);
+ BigDecimal taxMoney = BigDecimal.valueOf(0.00);
if (money.doubleValue() <= 800) {
taxMoney = money;
}
//绗竴涓弬鏁版槸闄ゆ暟锛岀浜屼釜鍙傛暟浠ｈ〃淇濈暀鍑犱綅灏忔暟锛岀涓変釜浠ｈ〃鐨勬槸浣跨敤鐨勬ā寮�
if (money.doubleValue() > 800 && money.doubleValue() <= 3360) {
- taxMoney = money.subtract(new BigDecimal(160)).divide(new BigDecimal(0.8), 2, BigDecimal.ROUND_UP);
+ taxMoney = money.subtract(new BigDecimal(160)).divide(new BigDecimal(0.8), 2, BigDecimal.ROUND_CEILING);
}
if (money.doubleValue() > 3360 && money.doubleValue() <= 21000) {
- taxMoney = money.divide(new BigDecimal(0.84), 2, BigDecimal.ROUND_DOWN);
+ taxMoney = money.divide(new BigDecimal(0.84), 2, BigDecimal.ROUND_CEILING);
}
- if (money.doubleValue() > 21000 && money.doubleValue() <= 40000) {
+ if (money.doubleValue() > 21000 && money.doubleValue() <= 49500) {
money = money.subtract(new BigDecimal(2000));
- taxMoney = money.divide(new BigDecimal(0.76), 2, BigDecimal.ROUND_DOWN);
+ taxMoney = money.divide(new BigDecimal(0.76), 2, BigDecimal.ROUND_CEILING);
}
- if (money.doubleValue() > 40000) {
+ if (money.doubleValue() > 49500) {
money = money.subtract(new BigDecimal(7000));
- taxMoney = money.divide(new BigDecimal(0.68), 2, BigDecimal.ROUND_DOWN);
+ taxMoney = money.divide(new BigDecimal(0.68), 2, BigDecimal.ROUND_CEILING);
}
- DecimalFormat decimalFormat = new DecimalFormat("#.00");
+ DecimalFormat decimalFormat = new DecimalFormat("#0.00");
+ //杩涗竴娉�
+ decimalFormat.setRoundingMode(RoundingMode.CEILING);
String format = decimalFormat.format(taxMoney);
log.info("绋庡墠閲戦涓猴細{}", format);
return format;
@@ -100,11 +106,11 @@
public static void main(String[] args) {
- String taxation = getTaxation(new BigDecimal(400));
- String taxationBefore = getTaxationBefore(new BigDecimal(400));
+ String taxation = getTaxation(BigDecimal.valueOf(43000));
+ String taxationBefore = getTaxationBefore(BigDecimal.valueOf(205892.36));
- System.out.println(taxation + " " + taxationBefore);
+ System.out.println("taxation:" + taxation + "============taxationBefore: " + taxationBefore);
}
}
--
Gitblit v1.9.3