From 49fb27f2739d0ebe6a36298f7228ba14f86bdef3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Mon, 7 Sep 2026 16:08:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E6=B0=B4=E9=87=91=E9=A2=9D=E5=8F=96?= =?UTF-8?q?=E5=80=BC=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BillingStatementApplicationService.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/mhd_bms/src/main/java/com/mhd/bms/application/server/billingStatement/BillingStatementApplicationService.java b/mhd_bms/src/main/java/com/mhd/bms/application/server/billingStatement/BillingStatementApplicationService.java index eaa155b66..3d9dd60e4 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/application/server/billingStatement/BillingStatementApplicationService.java +++ b/mhd_bms/src/main/java/com/mhd/bms/application/server/billingStatement/BillingStatementApplicationService.java @@ -832,7 +832,7 @@ public class BillingStatementApplicationService { reviewBillingJob(billingStatementDTO); BillingStatementADDVO billingStatementADDVO = new BillingStatementADDVO(); - BigDecimal amount = billingStatementDTO.getBillingAmount(); + BigDecimal amount = billingStatement.getBillingAmount(); BigDecimal taxAmount = amount.divide(BigDecimal.ONE.add(new BigDecimal(taxRate).divide(BigDecimal.valueOf(100))), 10, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(taxRate).divide(BigDecimal.valueOf(100))).setScale(2, BigDecimal.ROUND_HALF_UP); BigDecimal taxFreeFee = amount.subtract(taxAmount); allAmount.add(amount); @@ -889,7 +889,7 @@ public class BillingStatementApplicationService { reviewBillingJob(billingStatementDTO); BillingStatementADDVO billingStatementADDVO = new BillingStatementADDVO(); - BigDecimal amount = billingStatementDTO.getBillingAmount(); + BigDecimal amount = billingStatement.getBillingAmount(); BigDecimal taxAmount = amount.divide(BigDecimal.ONE.add(new BigDecimal(taxRate).divide(BigDecimal.valueOf(100))), 10, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(taxRate).divide(BigDecimal.valueOf(100))).setScale(2, BigDecimal.ROUND_HALF_UP); BigDecimal taxFreeFee = amount.subtract(taxAmount); allAmount.add(amount); @@ -961,7 +961,7 @@ public class BillingStatementApplicationService { reviewBillingJob(billingStatementDTO); BillingStatementADDVO billingStatementADDVO = new BillingStatementADDVO(); - BigDecimal amount = billingStatementDTO.getBillingAmount(); + BigDecimal amount = billingStatement.getBillingAmount(); BigDecimal taxAmount = amount.divide(BigDecimal.ONE.add(new BigDecimal(taxRate).divide(BigDecimal.valueOf(100))), 10, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(taxRate).divide(BigDecimal.valueOf(100))).setScale(2, BigDecimal.ROUND_HALF_UP); BigDecimal taxFreeFee = amount.subtract(taxAmount); allAmount.add(amount); @@ -1041,7 +1041,7 @@ public class BillingStatementApplicationService { reviewBillingJob(billingStatementDTO); BillingStatementADDVO billingStatementADDVO = new BillingStatementADDVO(); - BigDecimal amount = billingStatementDTO.getBillingAmount(); + BigDecimal amount = billingStatement.getBillingAmount(); BigDecimal taxAmount = amount.divide(BigDecimal.ONE.add(new BigDecimal(taxRate).divide(BigDecimal.valueOf(100))), 10, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(taxRate).divide(BigDecimal.valueOf(100))).setScale(2, BigDecimal.ROUND_HALF_UP); BigDecimal taxFreeFee = amount.subtract(taxAmount); allAmount.add(amount); @@ -1097,7 +1097,7 @@ public class BillingStatementApplicationService { reviewBillingJob(billingStatementDTO); BillingStatementADDVO billingStatementADDVO = new BillingStatementADDVO(); - BigDecimal amount = billingStatementDTO.getBillingAmount(); + BigDecimal amount = billingStatement.getBillingAmount(); BigDecimal taxAmount = amount.divide(BigDecimal.ONE.add(new BigDecimal(taxRate).divide(BigDecimal.valueOf(100))), 10, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(taxRate).divide(BigDecimal.valueOf(100))).setScale(2, BigDecimal.ROUND_HALF_UP); BigDecimal taxFreeFee = amount.subtract(taxAmount); allAmount.add(amount); @@ -1169,7 +1169,7 @@ public class BillingStatementApplicationService { reviewBillingJob(billingStatementDTO); BillingStatementADDVO billingStatementADDVO = new BillingStatementADDVO(); - BigDecimal amount = billingStatementDTO.getBillingAmount(); + BigDecimal amount = billingStatement.getBillingAmount(); BigDecimal taxAmount = amount.divide(BigDecimal.ONE.add(new BigDecimal(taxRate).divide(BigDecimal.valueOf(100))), 10, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(taxRate).divide(BigDecimal.valueOf(100))).setScale(2, BigDecimal.ROUND_HALF_UP); BigDecimal taxFreeFee = amount.subtract(taxAmount); allAmount.add(amount); @@ -1243,7 +1243,7 @@ public class BillingStatementApplicationService { reviewBillingJob(billingStatementDTO); BillingStatementADDVO billingStatementADDVO = new BillingStatementADDVO(); - BigDecimal amount = billingStatementDTO.getBillingAmount(); + BigDecimal amount = billingStatement.getBillingAmount(); BigDecimal taxAmount = amount.divide(BigDecimal.ONE.add(new BigDecimal(taxRate).divide(BigDecimal.valueOf(100))), 10, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(taxRate).divide(BigDecimal.valueOf(100))).setScale(2, BigDecimal.ROUND_HALF_UP); BigDecimal taxFreeFee = amount.subtract(taxAmount); allAmount.add(amount); @@ -1372,7 +1372,7 @@ public class BillingStatementApplicationService { reviewBillingJob(billingStatementDTO); BillingStatementADDVO billingStatementADDVO = new BillingStatementADDVO(); - BigDecimal amount = billingStatementDTO.getBillingAmount(); + BigDecimal amount = billingStatement.getBillingAmount(); BigDecimal taxAmount = amount.divide(BigDecimal.ONE.add(new BigDecimal(taxRate).divide(BigDecimal.valueOf(100))), 10, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(taxRate).divide(BigDecimal.valueOf(100))).setScale(2, BigDecimal.ROUND_HALF_UP); BigDecimal taxFreeFee = amount.subtract(taxAmount); allAmount.add(amount); @@ -1452,7 +1452,7 @@ public class BillingStatementApplicationService { reviewBillingJob(billingStatementDTO); BillingStatementADDVO billingStatementADDVO = new BillingStatementADDVO(); - BigDecimal amount = billingStatementDTO.getBillingAmount(); + BigDecimal amount = billingStatement.getBillingAmount(); BigDecimal taxAmount = amount.divide(BigDecimal.ONE.add(new BigDecimal(taxRate).divide(BigDecimal.valueOf(100))), 10, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(taxRate).divide(BigDecimal.valueOf(100))).setScale(2, BigDecimal.ROUND_HALF_UP); BigDecimal taxFreeFee = amount.subtract(taxAmount); allAmount.add(amount); @@ -1508,7 +1508,7 @@ public class BillingStatementApplicationService { reviewBillingJob(billingStatementDTO); BillingStatementADDVO billingStatementADDVO = new BillingStatementADDVO(); - BigDecimal amount = billingStatementDTO.getBillingAmount(); + BigDecimal amount = billingStatement.getBillingAmount(); BigDecimal taxAmount = amount.divide(BigDecimal.ONE.add(new BigDecimal(taxRate).divide(BigDecimal.valueOf(100))), 10, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(taxRate).divide(BigDecimal.valueOf(100))).setScale(2, BigDecimal.ROUND_HALF_UP); BigDecimal taxFreeFee = amount.subtract(taxAmount); allAmount.add(amount); @@ -1580,7 +1580,7 @@ public class BillingStatementApplicationService { reviewBillingJob(billingStatementDTO); BillingStatementADDVO billingStatementADDVO = new BillingStatementADDVO(); - BigDecimal amount = billingStatementDTO.getBillingAmount(); + BigDecimal amount = billingStatement.getBillingAmount(); BigDecimal taxAmount = amount.divide(BigDecimal.ONE.add(new BigDecimal(taxRate).divide(BigDecimal.valueOf(100))), 10, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(taxRate).divide(BigDecimal.valueOf(100))).setScale(2, BigDecimal.ROUND_HALF_UP); BigDecimal taxFreeFee = amount.subtract(taxAmount); allAmount.add(amount);