From 054cfdd53b732d2f60627fc9ac7cf92233d3c200 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 17 十一月 2023 16:17:56 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-common/src/main/java/com/ruoyi/common/tax/TaxtUtils.java |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 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 894d7f4..2389e95 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
@@ -5,6 +5,7 @@
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
+import lombok.extern.slf4j.Slf4j;
 
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
@@ -12,10 +13,11 @@
 import java.util.List;
 
 /**
- * 鍔冲姟鎶ラ叕涓◣璁$畻瑙勫垯 (鍙兘涓嶇瓟鍏叡鐢ㄦ硶锛岀敤鍓嶅厛鐪嬬湅鏄惁閫傚悎)
+ * 鍔冲姟鎶ラ叕涓◣璁$畻瑙勫垯 (鍙兘涓嶉�傚悎鍏叡鐢ㄦ硶锛岀敤鍓嶅厛鐪嬬湅鏄惁閫傚悎)
  *
  * @author ls
  */
+@Slf4j
 public class TaxtUtils {
     /**
      * 鍒嗛殧绗�
@@ -67,35 +69,39 @@
     public static String getTaxationBefore(BigDecimal money) {
         //褰揦<=800鏃讹紝涓◣T=0
         BigDecimal taxMoney = new BigDecimal(0.0);
-
+        if (money.doubleValue() <= 800) {
+            taxMoney = money;
+        }
+//绗竴涓弬鏁版槸闄ゆ暟锛岀浜屼釜鍙傛暟浠h〃淇濈暀鍑犱綅灏忔暟锛岀涓変釜浠h〃鐨勬槸浣跨敤鐨勬ā寮�
         if (money.doubleValue() > 800 && money.doubleValue() <= 3360) {
-            taxMoney = money.divide(new BigDecimal(0.2),2,BigDecimal.ROUND_DOWN).add(new BigDecimal(800));
+            taxMoney = money.subtract(new BigDecimal(160)).divide(new BigDecimal(0.8), 2, BigDecimal.ROUND_UP);
         }
 
         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_DOWN);
         }
 
         if (money.doubleValue() > 21000 && money.doubleValue() <= 40000) {
             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_DOWN);
         }
 
         if (money.doubleValue() > 40000) {
             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_DOWN);
         }
 
 
         DecimalFormat decimalFormat = new DecimalFormat("#.00");
         String format = decimalFormat.format(taxMoney);
+        log.info("绋庡墠閲戦涓猴細{}", format);
         return format;
     }
 
 
     public static void main(String[] args) {
-        String taxation = getTaxation(new BigDecimal(21000));
-        String taxationBefore = getTaxationBefore(new BigDecimal(52000));
+        String taxation = getTaxation(new BigDecimal(400));
+        String taxationBefore = getTaxationBefore(new BigDecimal(400));
 
 
         System.out.println(taxation + "        " + taxationBefore);

--
Gitblit v1.9.3