weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

南歧nc推送税费金额修改

Browse Source
This commit is contained in:
hjx
2026-01-19 16:55:50 +08:00
parent 1837337488
commit 88ac989ced
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java
+13 -6
View File
@@ -486,10 +486,13 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
item.setQuantity_de("0"); item.setQuantity_de("0");
item.setMoney_de(String.valueOf(tmsOrder.getDeliveryFreight())); item.setMoney_de(String.valueOf(tmsOrder.getDeliveryFreight()));
item.setMoney_bal(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 rate=tmsOrder.getTaxRate().divide(BigDecimal.valueOf(100));
BigDecimal notax_de=tmsOrder.getDeliveryFreight().subtract(tax_de); 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.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.setTax_de(String.valueOf(tax_de));
item.setPrice(String.valueOf(tmsOrder.getDeliveryFreight())); item.setPrice(String.valueOf(tmsOrder.getDeliveryFreight()));
item.setTaxprice(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_de(String.valueOf(reconciliationAccount.getAmount()));
item.setMoney_bal(String.valueOf(reconciliationAccount.getAmount())); item.setMoney_bal(String.valueOf(reconciliationAccount.getAmount()));
if(reconciliationAccount.getRate().compareTo(BigDecimal.ZERO)>0){ 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 rate=reconciliationAccount.getRate().divide(BigDecimal.valueOf(100));
BigDecimal notax_de=reconciliationAccount.getAmount().subtract(tax_de); 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.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.setTax_de(String.valueOf(tax_de));
}else{ }else{
BigDecimal tax_de=BigDecimal.ZERO; BigDecimal tax_de=BigDecimal.ZERO;