From f7da3211e7163562e65e1e5c1a7aca848ec5b85a Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 25 Mar 2024 11:17:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2082968=20=E6=89=93=E5=8C=85=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86--=E5=AD=97=E6=AE=B5=E5=92=8C=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=8F=98=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayPaymentRecordServiceImpl.java     | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

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 fea9f90a..94e150b0 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
@@ -346,6 +346,18 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 //是否还能再添加来款
                 isAdd(receivableAmount,paidAmount, payPaymentRecord.getAmountReceived());
 
+                break;
+            // 打包项目
+            case PayIncomeContractCommon.PROJECT_TYPE8:
+                PayPackCompany payPackCompany = payPackCompanyService.getById(payPaymentRecord.getProjectId());
+                if(Objects.isNull(payPackCompany)){
+                    throw new JeroBootException("项目不存在，不可提交！");
+                }
+                receivableAmount = payPackCompany.getReceivableAmount();//应收
+                paidAmount = payPackCompany.getPaidAmount();//实收
+                //是否还能再添加来款
+                isAdd(receivableAmount,paidAmount, payPaymentRecord.getAmountReceived());
+
                 break;
             default:break;
         }
@@ -1157,6 +1169,29 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
             //标协证书
             case PayIncomeContractCommon.PROJECT_TYPE6:
                 throw new JeroBootException("标协证书类型不可编辑！");
+            // 打包项目
+            case PayIncomeContractCommon.PROJECT_TYPE8:
+                PayPackCompany payPackCompany = payPackCompanyService.getById(payPaymentRecord.getProjectId());
+
+                receivableAmount = payPackCompany.getReceivableAmount();//应收
+                paidAmount=payPackCompany.getPaidAmount().subtract(oldRecord.getAmountReceived()).setScale(2, BigDecimal.ROUND_HALF_UP);//实收-上次来款
+                noTaxAmount=payPackCompany.getPaidNoTaxAmount().subtract(oldRecord.getNoTaxAmount()).setScale(2, BigDecimal.ROUND_HALF_UP);//实收-上次来款
+                tax=payPackCompany.getPaidTax().subtract(oldRecord.getTax()).setScale(2, BigDecimal.ROUND_HALF_UP);//实收-上次来款
+                //是否还能再添加来款
+                isAdd(receivableAmount,paidAmount, payPaymentRecord.getAmountReceived());
+
+                newPaidAmount =addPaidAmount(paidAmount,payPaymentRecord.getAmountReceived());//累加实收
+                inAccount = getInAccount(receivableAmount, newPaidAmount);//到账状态
+                tax = addPaidAmount(tax,payPaymentRecord.getTax());
+                noTaxAmount = addPaidAmount(noTaxAmount,payPaymentRecord.getNoTaxAmount());
+                payPackCompany.setPaidTax(tax);
+                payPackCompany.setPaidNoTaxAmount(noTaxAmount);
+                //更新主列表
+                payPackCompany.setPaidAmount(newPaidAmount);
+                payPackCompany.setInAccount(inAccount);
+                payPackCompanyService.updateById(payPackCompany);
+
+                break;
             default:break;
         }
         payPaymentRecordMapper.updateById(payPaymentRecord);