From 1bc45f6c4d2def13bb824a4a43baa758e9b01c4f Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 8 Nov 2022 17:53:37 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=8F=90=E5=8F=96=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E7=A8=8E=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/22年7月变更.sql | 3 +-- .../src/main/java/com/jero/config/StaticConfig.java | 7 +++++++ .../jero/mail/service/impl/PayMailBillServiceImpl.java | 5 +++-- .../service/impl/PayConfirmPaymentRecordService.java | 3 ++- .../payment/service/impl/PayPaymentCheckServiceImpl.java | 5 +++-- .../service/impl/PayPaymentRecordServiceImpl.java | 9 +++++---- .../src/main/resources/application-dev.yml | 2 ++ 7 files changed, 23 insertions(+), 11 deletions(-) diff --git a/db/22年7月变更.sql b/db/22年7月变更.sql index c4cb6521..6de7e215 100644 --- a/db/22年7月变更.sql +++ b/db/22年7月变更.sql @@ -88,8 +88,7 @@ CREATE TABLE `pay_manager_management` UNIQUE KEY `contacts_company_and_name_index` (`company_id`, `name`) USING BTREE COMMENT '企业与姓名唯一', KEY `contacts_company_name_index` (`company_name`) USING BTREE, KEY `contacts_name_index` (`name`) USING BTREE -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4 COMMENT ='企业管理员管理'; +) COMMENT ='企业管理员管理'; alter table pay_company_management add column link_bank_number varchar(50) null comment '联行号'; 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 cc875930..abb444b1 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 @@ -23,6 +23,13 @@ public class StaticConfig { @Value(value = "${spring.mail.host}") private String host; + public static String TAX_RATE; + + @Value("${tax_rate}") + public void setTaxRate(String taxRate) { + StaticConfig.TAX_RATE = taxRate; + } + /*@Bean public void initStatic() { 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 f4a32e43..f26fb4bc 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 @@ -23,6 +23,7 @@ import com.jero.company.entity.PayContactsManagement; import com.jero.company.mapper.PayContactsManagementMapper; import com.jero.company.service.IPayCompanyManagementService; import com.jero.company.service.IPayContactsManagementService; +import com.jero.config.StaticConfig; import com.jero.contract.common.PayIncomeContractCommon; import com.jero.mail.PayMailBillVO; import com.jero.mail.entity.BillingInfo; @@ -802,7 +803,7 @@ public class PayMailBillServiceImpl extends ServiceImpl listId = new ArrayList<>(); - BigDecimal divide = payPaymentRecord.getAmountReceived().divide(new BigDecimal("1.06"), 2, RoundingMode.HALF_UP); + BigDecimal divide = payPaymentRecord.getAmountReceived().divide(new BigDecimal(StaticConfig.TAX_RATE), 2, RoundingMode.HALF_UP); //累加主列表实收金额 //来款条件校验 amountReceivedVerification( payPaymentRecord, flag); @@ -641,7 +642,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl