From 5184461abf2af5ef36f170438aeafc268514b763 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 11 Mar 2024 11:27:50 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=89=93=E5=8C=85=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=9D=A1=E7=9B=AE=20=E6=9D=A5=E6=AC=BE=20=E5=BC=80=E7=A5=A8=20?=
 =?UTF-8?q?=E7=A1=AE=E6=94=B6=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/PayIncomeContractCommon.java       |  4 ++
 .../service/impl/PayMailBillServiceImpl.java  | 45 ++++++++++++++++++-
 .../impl/PayConfirmPaymentRecordService.java  | 17 +++++++
 .../impl/PayPaymentRecordServiceImpl.java     | 19 ++++++++
 4 files changed, 84 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java
index 0348c539..f54f21ae 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java
@@ -75,6 +75,10 @@ public class PayIncomeContractCommon {
      * 6:标协证书项目
      */
     public final static String PROJECT_TYPE6 = "6";
+    /**
+     * 7:打包项目
+     */
+    public final static String PROJECT_TYPE7 = "7";
     /**
      * 来款状态 0：全部 1:到期未付款
      */
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 05811d73..69a12099 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
@@ -45,6 +45,8 @@ import com.jero.member.mapper.*;
 import com.jero.member.service.*;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
+import com.jero.pack.entity.PayPackCompany;
+import com.jero.pack.service.IPayPackCompanyService;
 import com.jero.payment.service.IPayPaymentRecordService;
 import com.jero.project.entity.PayCommonProject;
 import com.jero.project.entity.PayWorkingGroup;
@@ -156,6 +158,8 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
     private ITbCertificatePaymentService tbCertificatePaymentService;
     @Resource
     private PayWorkingGroupSubItemContactsMapper payWorkingGroupSubItemContactsMapper;
+    @Resource
+    private IPayPackCompanyService payPackCompanyService;
 
 
     @Override
@@ -388,7 +392,22 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                             listId.add(meetingTemporary);
                         }
                         break;
-                    default:break;
+                    //打包项目
+                    case PayIncomeContractCommon.PROJECT_TYPE7:
+                        PayPackCompany payPackCompany = payPackCompanyService.getById(p.getProjectId());
+                        if (Objects.isNull(payPackCompany)) {
+                            throw new JeroBootException("项目不存在！");
+                        }
+                        PayContactsManagementTemporary payPackCompanyTemporary = payContactsManagementTemporaryService
+                                .getById(payPackCompany.getCompanyContactTemporaryId());
+                        if (!Objects.isNull(payPackCompanyTemporary)) {
+                            listId.add(payPackCompanyTemporary);
+                        }
+                        PayCompanyManagement company = payCompanyManagementService.getById(payPackCompany.getCompanyId());
+                        project = company.getCompanyName();
+                        break;
+                    default:
+                        break;
 
                 }
 
@@ -953,6 +972,30 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     //if(1!=tbMemberCertificate.getInAccount()){
                     //    return "标协证书项目必须先审核通过才可开票";
                     //}
+                    // 普通项目
+                case PayIncomeContractCommon.PROJECT_TYPE7:
+                    PayPackCompany payPackCompany = payPackCompanyService.getById(bmpList.get(i).getProjectId());
+                    //将第一个项目作为基准公司
+                    if (i == 0) {
+                        standardCompanyId = payPackCompany.getCompanyId();
+                    }
+                    if (!standardCompanyId.equals(payPackCompany.getCompanyId())) {
+                        return "打包开票只能是同一个企业";
+                    }
+                    oldInvoiceAmount = payPackCompany.getInvoiceAmount();
+                    if(oldInvoiceAmount == null){
+                        oldInvoiceAmount= new BigDecimal("0");
+                    }
+                    //之前开票总额+本次开票金额
+                    invoiceAmount = oldInvoiceAmount.add(bmpList.get(i).getInvoiceAmount()).setScale(2, BigDecimal.ROUND_HALF_UP);
+                    //开票总额>应收
+                    if(invoiceAmount.compareTo(payPackCompany.getReceivableAmount()) == 1){
+                        return "开票金额大于当前未开票金额，输入有误！";
+                    }
+                    PayCompanyManagementTemporary payPackCompanyManagement = payCompanyManagementTemporaryService.getById(payPackCompany.getCompanyTemporaryId());
+                    if(!Objects.isNull(payPackCompanyManagement) && "2".equals(payPackCompanyManagement.getStatus()) ){
+                        return "企业未审核，需要审核后开票";
+                    }
                     break;
                 default:
                     break;
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 5bcf129b..834e7ac5 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
@@ -16,6 +16,8 @@ import com.jero.member.entity.TbMemberProjectSubitem;
 import com.jero.member.mapper.PayMemberProjectSubitemMapper;
 import com.jero.member.mapper.TbCertificatePaymentMapper;
 import com.jero.member.mapper.TbMemberProjectSubitemMapper;
+import com.jero.pack.entity.PayPackCompany;
+import com.jero.pack.service.IPayPackCompanyService;
 import com.jero.payment.entity.PayConfirmPaymentRecord;
 import com.jero.payment.mapper.PayConfirmPaymentRecordMapper;
 import com.jero.payment.mapper.PayPaymentRecordMapper;
@@ -59,6 +61,8 @@ public class PayConfirmPaymentRecordService extends ServiceImpl<PayConfirmPaymen
     private IPayPaymentRecordService payPaymentRecordService;
     @Resource
     private PayPaymentRecordMapper payPaymentRecordMapper;
+    @Resource
+    private IPayPackCompanyService payPackCompanyService;
 
 
     public void add(PayConfirmPaymentRecord payConfirmPaymentRecord) {
@@ -177,6 +181,19 @@ public class PayConfirmPaymentRecordService extends ServiceImpl<PayConfirmPaymen
                     throw new JeroBootException("确收金额不能大于待确收金额");
                 }
                 break;
+            // 打包项目
+            case PayIncomeContractCommon.PROJECT_TYPE7:
+                PayPackCompany payPackCompany = payPackCompanyService.getById(projectId);
+                if (payPackCompany == null) {
+                    throw new JeroBootException("项目不存在");
+                }
+                // 获取待确收金额
+                receivableAmount = payPackCompany.getReceivableAmount();
+                // 如果当前确认金额不能大于当前项目的待确收金额
+                if (confirmAmount.compareTo(receivableAmount.subtract(totalAmount)) > 0) {
+                    throw new JeroBootException("确收金额不能大于待确收金额");
+                }
+                break;
             default:
                 break;
         }
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 a1b3cb5e..24c1cec4 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
@@ -40,6 +40,8 @@ import com.jero.member.service.IPayMemberProjectService;
 import com.jero.member.service.ITbMemberProjectService;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysUserService;
+import com.jero.pack.entity.PayPackCompany;
+import com.jero.pack.service.IPayPackCompanyService;
 import com.jero.payment.entity.PayPaymentRecord;
 import com.jero.payment.entity.PayPaymentRecordSub;
 import com.jero.payment.mapper.PayPaymentCheckMapper;
@@ -132,6 +134,8 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
     private IPayCompanyManagementService payCompanyManagementService;
     @Resource
     private IPayWorkingGroupSubItemContactsService payWorkingGroupSubItemContactsService;
+    @Resource
+    private IPayPackCompanyService payPackCompanyService;
 
     @Value("${jero.path.upload}")
     private String upLoadPath;
@@ -558,6 +562,21 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 ////                tbCheckCerVo.setCheckMark(payPaymentRecord.getRemark());
 //                typr6List.add(tbCheckCerVo);
 
+                break;
+            // 打包项目
+            case PayIncomeContractCommon.PROJECT_TYPE7:
+
+                PayPackCompany payPackCompany = payPackCompanyService.getById(payPaymentRecord.getProjectId());
+                newPaidAmount = addPaidAmount(payPackCompany.getPaidAmount(),payPaymentRecord.getAmountReceived());//累加实收
+                inAccount = getInAccount(payPackCompany.getReceivableAmount(), newPaidAmount);//到账状态
+                tax = addPaidAmount(payPackCompany.getPaidTax(),payPaymentRecord.getTax());
+                noTaxAmount = addPaidAmount(payPackCompany.getPaidNoTaxAmount(),payPaymentRecord.getNoTaxAmount());
+                payPackCompany.setPaidTax(tax);
+                payPackCompany.setPaidNoTaxAmount(noTaxAmount);
+                //更新主列表
+                payPackCompany.setPaidAmount(newPaidAmount);
+                payPackCompany.setInAccount(inAccount);
+                payPackCompanyService.updateById(payPackCompany);
                 break;
             default:break;
         }