From 6892c31200a7ed1b0e60ee5aff794b1fcecc7ef6 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 01 十一月 2023 16:28:06 +0800
Subject: [PATCH] 解决文件上传时，文件名重复问题
---
ruoyi-common/src/main/java/com/ruoyi/common/tax/TaxtUtils.java | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 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 3a78e57..846a0a0 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
@@ -12,7 +12,7 @@
import java.util.List;
/**
- * 鍔冲姟鎶ラ叕涓◣璁＄畻瑙勫垯 (鍙兘涓嶇瓟鍏叡鐢ㄦ硶锛岀敤鍓嶅厛鐪嬬湅鏄惁閫傚悎)
+ * 鍔冲姟鎶ラ叕涓◣璁＄畻瑙勫垯 (鍙兘涓嶉�傚悎鍏叡鐢ㄦ硶锛岀敤鍓嶅厛鐪嬬湅鏄惁閫傚悎)
*
* @author ls
*/
@@ -41,7 +41,7 @@
// 褰揦>4000鏃�
//(1)褰揦*(1-20%)<=20000鏃讹紝涓◣T=X*(1-20%)*20%
if (money.doubleValue() > 4000 && multiply.doubleValue() <= 20000) {
- taxMoney = multiply.multiply(new BigDecimal(0.8));
+ taxMoney = multiply.multiply(new BigDecimal(0.2));
}
//(2)褰�20000<X*(1-20%)<=50000鏃讹紝涓◣T=X*(1-20%)*30%-2000
@@ -58,9 +58,47 @@
return format;
}
+ /**
+ * 閫氳繃绋庡悗宸ヨ祫锛岀畻鍑虹◣鍓嶅伐璧�
+ *
+ * @param money
+ * @return
+ */
+ public static String getTaxationBefore(BigDecimal money) {
+ //褰揦<=800鏃讹紝涓◣T=0
+ BigDecimal taxMoney = new BigDecimal(0.0);
+//绗竴涓弬鏁版槸闄ゆ暟锛岀浜屼釜鍙傛暟浠ｈ〃淇濈暀鍑犱綅灏忔暟锛岀涓変釜浠ｈ〃鐨勬槸浣跨敤鐨勬ā寮�
+ if (money.doubleValue() > 800 && money.doubleValue() <= 3360) {
+ 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);
+ }
+
+ if (money.doubleValue() > 21000 && money.doubleValue() <= 40000) {
+ money = money.subtract(new BigDecimal(2000));
+ 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);
+ }
+
+
+ DecimalFormat decimalFormat = new DecimalFormat("#.00");
+ String format = decimalFormat.format(taxMoney);
+ return format;
+ }
+
+
public static void main(String[] args) {
- String taxation = getTaxation(new BigDecimal(70000));
- System.out.println(taxation);
+ String taxation = getTaxation(new BigDecimal(21000));
+ String taxationBefore = getTaxationBefore(new BigDecimal(52000));
+
+
+ System.out.println(taxation + " " + taxationBefore);
}
}
--
Gitblit v1.9.3