diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/StaticConfig.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/StaticConfig.java index abb444b1..f2835eb0 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/StaticConfig.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/StaticConfig.java @@ -4,6 +4,8 @@ import lombok.Data; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; +import java.math.BigDecimal; + /** * 设置静态参数初始化 */ @@ -22,12 +24,19 @@ public class StaticConfig { @Value(value = "${spring.mail.host}") private String host; - - public static String TAX_RATE; + /** + * 税率 + */ + public static BigDecimal TAX_RATE; + /** + * 税率计算 + */ + public static BigDecimal TAX_RATE_CALCULATE; @Value("${tax_rate}") public void setTaxRate(String taxRate) { - StaticConfig.TAX_RATE = taxRate; + StaticConfig.TAX_RATE = new BigDecimal(taxRate); + StaticConfig.TAX_RATE_CALCULATE = new BigDecimal(taxRate).add(BigDecimal.ONE); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java index ebb08ceb..53b2372d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java @@ -803,7 +803,7 @@ public class PayMailBillServiceImpl extends ServiceImpl listId = new ArrayList<>(); - BigDecimal divide = payPaymentRecord.getAmountReceived().divide(new BigDecimal(StaticConfig.TAX_RATE), 2, RoundingMode.HALF_UP); + BigDecimal divide = payPaymentRecord.getAmountReceived().divide(StaticConfig.TAX_RATE_CALCULATE, 2, RoundingMode.HALF_UP); //累加主列表实收金额 //来款条件校验 amountReceivedVerification( payPaymentRecord, flag); @@ -642,7 +642,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl