From 1e10417306f43fe498af1b4d73dc29ac58a99a99 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 3 Aug 2022 15:49:55 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E5=88=B0=E8=B4=A6=E5=BC=80=E7=A5=A8-?=
 =?UTF-8?q?=E6=A0=87=E5=8D=8F=E9=A1=B9=E7=9B=AE-=E5=AE=A1=E6=A0=B8=20?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=AD=A3=E5=B8=B8=E6=9D=A5=E6=AC=BE=E5=B9=B6?=
 =?UTF-8?q?=E4=B8=94=E8=87=AA=E5=8A=A8=E5=88=A4=E6=96=AD=E7=A8=8E=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayPaymentCheckController.java |  7 +---
 .../impl/PayPaymentCheckServiceImpl.java      | 38 +++++++++++++++++++
 2 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java
index 61cace99..48911421 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentCheckController.java
@@ -102,12 +102,7 @@ public class PayPaymentCheckController extends JeroController<PayPaymentRecordSu
    @PostMapping(value = "/check")
    @RequiresPermissions("incomePaymentAndInvoiving:audit")
    public Result<?> check(@RequestBody PayPaymentRecord payPaymentRecord) {
-       try{
-           payPaymentCheckService.check(payPaymentRecord);
-       }catch (Exception e){
-           log.error("审核异常",e);
-           return Result.error(e.getMessage());
-       }
+       payPaymentCheckService.check(payPaymentRecord);
        return Result.OK("操作成功");
    }
 
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 8adc73ee..7cf927b4 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
@@ -55,6 +55,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 
 /**
@@ -553,6 +554,19 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
 
                 if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
                     //已同意
+                    //如果没有发票就存入0
+                    BigDecimal noTaxAmount;
+                    BigDecimal tax;
+                    BigDecimal amountReceived = payPaymentRecord.getAmountReceived();
+                    if (tbMember.getInvoiceRequirements() == 0) {
+                        noTaxAmount = amountReceived;
+                        tax = BigDecimal.ZERO;
+                    }else {
+                        noTaxAmount = amountReceived.divide(new BigDecimal("1.06"), 2, RoundingMode.HALF_UP);
+                        tax = amountReceived.subtract(noTaxAmount);
+                    }
+                    payPaymentRecord.setTax(tax);
+                    payPaymentRecord.setNoTaxAmount(noTaxAmount);
                     //来款条件校验
                     payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
 
@@ -565,7 +579,12 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                     //插入来款记录表
                     payPaymentRecord.setId(null);
                     payPaymentRecord.setPaymentStatus(paymentStatus);
+                    payPaymentRecord.setNoTaxAmount(noTaxAmount);
+                    payPaymentRecord.setTax(tax);
                     payPaymentRecordMapper.insert(payPaymentRecord);
+                    //保存税额
+                    tbMember.setConfirmTax(tax);
+                    tbMember.setConfirmNoTaxAmount(noTaxAmount);
 
                     tbCheckVo.setCheckResult(PayProjectCommon.YES);
                     //发消息
@@ -611,6 +630,19 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
 
                 if(PaymentStatusEnum.COMPLETED.getCode().equals(payPaymentRecord.getPaymentStatus())) {
                     //已同意
+                    //如果没有发票就存入0
+                    BigDecimal noTaxAmount;
+                    BigDecimal tax;
+                    BigDecimal amountReceived = payPaymentRecord.getAmountReceived();
+                    if (tbMemberCertificate.getInvoiceRequirements() == 0) {
+                        noTaxAmount = amountReceived;
+                        tax = BigDecimal.ZERO;
+                    }else {
+                        noTaxAmount = amountReceived.divide(new BigDecimal("1.06"), 2, RoundingMode.HALF_UP);
+                        tax = amountReceived.subtract(noTaxAmount);
+                    }
+                    payPaymentRecord.setTax(tax);
+                    payPaymentRecord.setNoTaxAmount(noTaxAmount);
                     //来款条件校验
                     payPaymentRecordService.amountReceivedVerification( payPaymentRecord, ProjectCommon.PAYMENT_FLAG2);
 
@@ -622,9 +654,15 @@ public class PayPaymentCheckServiceImpl extends ServiceImpl<PayPaymentCheckMappe
                     tbMemberCertificate.setPaymentStatus(paymentStatus);
                     //插入来款记录表
                     payPaymentRecord.setId(null);
+                    payPaymentRecord.setNoTaxAmount(noTaxAmount);
+                    payPaymentRecord.setTax(tax);
                     payPaymentRecord.setPaymentStatus(paymentStatus);
                     payPaymentRecordMapper.insert(payPaymentRecord);
 
+                    //保存税额
+                    tbMemberCertificate.setConfirmTax(tax);
+                    tbMemberCertificate.setConfirmNoTaxAmount(noTaxAmount);
+
                     tbCheckCerVo.setCheckResult(PayProjectCommon.YES);
 
                     //发消息