From d5bedfddd155ba017b66090b02c8659c1fb2567e Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 11 Nov 2022 14:00:51 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=BC=96=E8=BE=91=E5=8F=82=E4=BC=9A?=
 =?UTF-8?q?=E4=BA=BA=E7=9A=84=E9=87=91=E9=A2=9D=E5=92=8C=E7=A8=8E=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/config/StaticConfig.java    | 15 ++++++++---
 .../service/impl/PayMailBillServiceImpl.java  |  4 +--
 .../impl/PayMeetingSituationServiceImpl.java  | 25 ++++++++++++++++++-
 .../impl/PayConfirmPaymentRecordService.java  |  2 +-
 .../impl/PayPaymentCheckServiceImpl.java      |  4 +--
 .../impl/PayPaymentRecordServiceImpl.java     |  8 +++---
 .../src/main/resources/application-dev.yml    |  2 +-
 7 files changed, 46 insertions(+), 14 deletions(-)

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<PayMailBillMapper, PayMa
         BigDecimal noTaxAmount = payMailBillProject.getNoTaxAmount();
         BigDecimal tax = payMailBillProject.getTax();
         if (noTaxAmount == null || tax == null){
-            noTaxAmount = invoiceAmount.divide(new BigDecimal(StaticConfig.TAX_RATE), 2, RoundingMode.HALF_UP);
+            noTaxAmount = invoiceAmount.divide(StaticConfig.TAX_RATE_CALCULATE, 2, RoundingMode.HALF_UP);
             tax = invoiceAmount.subtract(noTaxAmount);
         }
         payPaymentRecordService.isTax(noTaxAmount,tax,invoiceAmount);
@@ -1140,7 +1140,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
         BigDecimal noTaxAmount = bm.getNoTaxAmount();
         BigDecimal tax = bm.getTax();
         if (noTaxAmount == null || tax == null){
-            noTaxAmount = thisInvoiceAmount.divide(new BigDecimal(StaticConfig.TAX_RATE), 2, RoundingMode.HALF_UP);
+            noTaxAmount = thisInvoiceAmount.divide(StaticConfig.TAX_RATE_CALCULATE, 2, RoundingMode.HALF_UP);
             tax = thisInvoiceAmount.subtract(noTaxAmount);
             bm.setNoTaxAmount(noTaxAmount);
             bm.setTax(tax);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index b919d8b5..6d9a6a77 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -30,6 +30,7 @@ import com.jero.company.entity.PayCompanyManagement;
 import com.jero.company.entity.PayContactsManagement;
 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.contract.entity.PayIncomeContract;
 import com.jero.contract.entity.PayIncomeContractAssociated;
@@ -77,6 +78,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -972,7 +974,10 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         if (ObjectUtil.isNull(payMeetingSituation)) {
             throw new JeroBootException("参会人错误!");
         }
-        payMeetingSituationVO.setAmountReceivable(payMeetingSituation.getAmountReceivable());
+        BigDecimal amountReceivable = payMeetingSituationVO.getAmountReceivable();
+        if (amountReceivable == null){
+            payMeetingSituationVO.setAmountReceivable(BigDecimal.ZERO);
+        }
         BeanUtils.copyProperties(payMeetingSituationVO, payMeetingSituation);
         //处理校验参会人信息
         PayMeetingSituation payMeetingSituation1;
@@ -1234,6 +1239,21 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             payMeetingSituation1.setCheckInHotel(payMeetingSituation.getCheckInHotel());
             payMeetingSituation1.setArrivalTime(payMeetingSituation.getArrivalTime());
             payMeetingSituation1.setDepartureTime(payMeetingSituation.getDepartureTime());
+            //处理默认税率
+            BigDecimal amountReceivable = payMeetingSituation1.getAmountReceivable();
+            BigDecimal taxRate = payMeetingSituation.getTaxRate();
+            if (taxRate == null){
+                payMeetingSituation1.setTaxRate(StaticConfig.TAX_RATE);
+                BigDecimal noTaxAmount = amountReceivable.divide(StaticConfig.TAX_RATE_CALCULATE, 2, RoundingMode.HALF_UP);
+                BigDecimal tax = amountReceivable.subtract(noTaxAmount);
+                payMeetingSituation1.setNoTaxAmount(noTaxAmount);
+                payMeetingSituation1.setTax(tax);
+            }else {
+                payMeetingSituation1.setTaxRate(taxRate);
+                payMeetingSituation1.setNoTaxAmount(payMeetingSituation.getNoTaxAmount());
+                payMeetingSituation1.setTax(payMeetingSituation.getTax());
+            }
+            payMeetingSituation1.setAmountReceivable(payMeetingSituation.getAmountReceivable());
             //其他会议的嘉宾和内部企业
         } else {
             CommonGuestVO commonGuestVO = new CommonGuestVO();
@@ -1297,6 +1317,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         payMeetingSituation1.setPaidNoTaxAmount(BigDecimal.ZERO);
 
         payMeetingSituation1.setPayMode(0);
+        payMeetingSituation1.setTaxRate(BigDecimal.ZERO);
+        payMeetingSituation1.setTax(BigDecimal.ZERO);
+        payMeetingSituation1.setNoTaxAmount(BigDecimal.ZERO);
     }
 
     /**
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayConfirmPaymentRecordService.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayConfirmPaymentRecordService.java
index 5de1d7f9..1f247edb 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayConfirmPaymentRecordService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayConfirmPaymentRecordService.java
@@ -56,7 +56,7 @@ public class PayConfirmPaymentRecordService extends ServiceImpl<PayConfirmPaymen
         BigDecimal tax = payConfirmPaymentRecord.getTax();
         BigDecimal amountReceived = payConfirmPaymentRecord.getAmountReceived();
         if (noTaxAmount == null || tax == null){
-            noTaxAmount = amountReceived.divide(new BigDecimal(StaticConfig.TAX_RATE), 2, RoundingMode.HALF_UP);
+            noTaxAmount = amountReceived.divide(StaticConfig.TAX_RATE_CALCULATE, 2, RoundingMode.HALF_UP);
             tax = amountReceived.subtract(noTaxAmount);
             payConfirmPaymentRecord.setNoTaxAmount(noTaxAmount);
             payConfirmPaymentRecord.setTax(tax);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java
index 9e9da154..fa01c2b2 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentCheckServiceImpl.java
@@ -565,7 +565,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                         noTaxAmount = amountReceived;
                         tax = BigDecimal.ZERO;
                     }else {
-                        noTaxAmount = amountReceived.divide(new BigDecimal(StaticConfig.TAX_RATE), 2, RoundingMode.HALF_UP);
+                        noTaxAmount = amountReceived.divide(StaticConfig.TAX_RATE_CALCULATE, 2, RoundingMode.HALF_UP);
                         tax = amountReceived.subtract(noTaxAmount);
                     }
                     payPaymentRecord.setTax(tax);
@@ -642,7 +642,7 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                         noTaxAmount = amountReceived;
                         tax = BigDecimal.ZERO;
                     }else {
-                        noTaxAmount = amountReceived.divide(new BigDecimal(StaticConfig.TAX_RATE), 2, RoundingMode.HALF_UP);
+                        noTaxAmount = amountReceived.divide(StaticConfig.TAX_RATE_CALCULATE, 2, RoundingMode.HALF_UP);
                         tax = amountReceived.subtract(noTaxAmount);
                     }
                     payPaymentRecord.setTax(tax);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
index 46320052..99e2b850 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
@@ -213,7 +213,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
             BigDecimal tax1 = payPaymentRecord.getTax();
             if (noTaxAmount1 == null || tax1 == null){
                 BigDecimal amountReceived = payPaymentRecord.getAmountReceived();
-                BigDecimal noTaxAmount = amountReceived.divide(new BigDecimal(StaticConfig.TAX_RATE), 2, RoundingMode.HALF_UP);
+                BigDecimal noTaxAmount = amountReceived.divide(StaticConfig.TAX_RATE_CALCULATE, 2, RoundingMode.HALF_UP);
                 BigDecimal tax = amountReceived.subtract(noTaxAmount);
                 payPaymentRecord.setNoTaxAmount(noTaxAmount);
                 payPaymentRecord.setTax(tax);
@@ -367,7 +367,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
         BigDecimal noTaxAmount;
         List<PayContactsManagementTemporary> 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<PayPaymentRecordMap
                 noTaxAmount = amountReceived;
                 tax = BigDecimal.ZERO;
             }else {
-                noTaxAmount = amountReceived.divide(new BigDecimal(StaticConfig.TAX_RATE), 2, RoundingMode.HALF_UP);
+                noTaxAmount = amountReceived.divide(StaticConfig.TAX_RATE_CALCULATE, 2, RoundingMode.HALF_UP);
                 tax = amountReceived.subtract(noTaxAmount);
             }
             //保存税额
@@ -696,7 +696,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
             noTaxAmount = amountReceived;
             tax = BigDecimal.ZERO;
         }else {
-            noTaxAmount = amountReceived.divide(new BigDecimal(StaticConfig.TAX_RATE), 2, RoundingMode.HALF_UP);
+            noTaxAmount = amountReceived.divide(StaticConfig.TAX_RATE_CALCULATE, 2, RoundingMode.HALF_UP);
             tax = amountReceived.subtract(noTaxAmount);
         }
         //保存税额
diff --git a/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot-single-startup/src/main/resources/application-dev.yml
index 2ff0f53d..c239c95d 100644
--- a/jero-boot-single-startup/src/main/resources/application-dev.yml
+++ b/jero-boot-single-startup/src/main/resources/application-dev.yml
@@ -339,4 +339,4 @@ singleSignON:
   client_secret: 3a381f2432d648879ebd10ba7b54a8ae
   client_url: https://iam.catarc.ac.cn
 
-tax_rate: 1.06
\ No newline at end of file
+tax_rate: 0.06
\ No newline at end of file