From 88ac989ced0f39f929710a9159f36a3ca55720ed Mon Sep 17 00:00:00 2001
From: hjx <577364224@qq.com>
Date: Mon, 19 Jan 2026 16:55:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=97=E6=AD=A7nc=E6=8E=A8=E9=80=81=E7=A8=8E?=
 =?UTF-8?q?=E8=B4=B9=E9=87=91=E9=A2=9D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../persistence/ReconciliationImpl.java       | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java
index 89e6a0cf1..fc0fe9732 100644
--- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java
+++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java
@@ -486,10 +486,13 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                                 item.setQuantity_de("0");
                                 item.setMoney_de(String.valueOf(tmsOrder.getDeliveryFreight()));
                                 item.setMoney_bal(String.valueOf(tmsOrder.getDeliveryFreight()));
-                                BigDecimal tax_de=tmsOrder.getDeliveryFreight().multiply(tmsOrder.getTaxRate().divide(BigDecimal.valueOf(100))).setScale(2,BigDecimal.ROUND_HALF_UP);
-                                BigDecimal notax_de=tmsOrder.getDeliveryFreight().subtract(tax_de);
+                                BigDecimal rate=tmsOrder.getTaxRate().divide(BigDecimal.valueOf(100));
+                                BigDecimal taxRate=BigDecimal.ONE.add(rate);
+                              //  BigDecimal tax_de=tmsOrder.getDeliveryFreight().multiply(tmsOrder.getTaxRate().divide(BigDecimal.valueOf(100))).setScale(2,BigDecimal.ROUND_HALF_UP);
+                                BigDecimal notax_de=tmsOrder.getDeliveryFreight().divide(taxRate,2,BigDecimal.ROUND_HALF_UP);
+                                BigDecimal tax_de=notax_de.multiply(tmsOrder.getTaxRate().divide(BigDecimal.valueOf(100))).setScale(2,BigDecimal.ROUND_HALF_UP);
                                 item.setNotax_de(String.valueOf(notax_de));
-                                item.setLocal_tax_de(String.valueOf(notax_de));
+                                item.setLocal_tax_de(String.valueOf(tax_de));
                                 item.setTax_de(String.valueOf(tax_de));
                                 item.setPrice(String.valueOf(tmsOrder.getDeliveryFreight()));
                                 item.setTaxprice(String.valueOf(tmsOrder.getDeliveryFreight()));
@@ -684,10 +687,14 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
                                         item.setMoney_de(String.valueOf(reconciliationAccount.getAmount()));
                                         item.setMoney_bal(String.valueOf(reconciliationAccount.getAmount()));
                                         if(reconciliationAccount.getRate().compareTo(BigDecimal.ZERO)>0){
-                                            BigDecimal tax_de=reconciliationAccount.getAmount().multiply(reconciliationAccount.getRate().divide(BigDecimal.valueOf(100))).setScale(2,BigDecimal.ROUND_HALF_UP);
-                                            BigDecimal notax_de=reconciliationAccount.getAmount().subtract(tax_de);
+                                            BigDecimal rate=reconciliationAccount.getRate().divide(BigDecimal.valueOf(100));
+                                            BigDecimal taxRate=BigDecimal.ONE.add(rate);
+                                            //  BigDecimal tax_de=tmsOrder.getDeliveryFreight().multiply(tmsOrder.getTaxRate().divide(BigDecimal.valueOf(100))).setScale(2,BigDecimal.ROUND_HALF_UP);
+                                            BigDecimal notax_de=reconciliationAccount.getAmount().divide(taxRate,2,BigDecimal.ROUND_HALF_UP);
+                                            BigDecimal tax_de=notax_de.multiply(reconciliationAccount.getRate().divide(BigDecimal.valueOf(100))).setScale(2,BigDecimal.ROUND_HALF_UP);
+
                                             item.setNotax_de(String.valueOf(notax_de));
-                                            item.setLocal_tax_de(String.valueOf(notax_de));
+                                            item.setLocal_tax_de(String.valueOf(tax_de));
                                             item.setTax_de(String.valueOf(tax_de));
                                         }else{
                                             BigDecimal tax_de=BigDecimal.ZERO;