From cdcb65cb0325312cae2ed372cdb037ba2a0d43c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Fri, 15 Oct 2021 11:10:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A5=E6=AC=BE=E5=BC=80=E7=A5=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayMailBillServiceImpl.java  | 34 +++++++++++++++----
 .../impl/PayPaymentRecordServiceImpl.java     | 34 ++++++++++++++++---
 2 files changed, 57 insertions(+), 11 deletions(-)

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 40c4e072..2a5bb564 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
@@ -16,6 +16,7 @@ import com.jero.company.entity.PayCompanyManagement;
 import com.jero.company.entity.PayContactsManagement;
 import com.jero.company.mapper.PayCompanyManagementMapper;
 import com.jero.company.mapper.PayContactsManagementMapper;
+import com.jero.company.service.IPayCompanyManagementService;
 import com.jero.company.service.IPayContactsManagementService;
 import com.jero.contract.common.PayIncomeContractCommon;
 import com.jero.mail.PayMailBillVO;
@@ -99,8 +100,11 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
     private PayMailBillProjectMapper payMailBillProjectMapper;
     @Resource
     PayCompanyManagementMapper payCompanyManagementMapper;
-    @Autowired
+    @Resource
     private IPayCompanyManagementTemporaryService payCompanyManagementTemporaryService;
+    @Resource
+    private IPayCompanyManagementService payCompanyManagementService;
+
 
     @Override
     public List<PayMailBill> selectMailBillVO(String projectId) {
@@ -314,6 +318,10 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     if(invoiceAmount.compareTo(payCommonProject.getReceivableAmount()) == 1){
                         return "开票金额大于当前欠未开票金额，输入有误！";
                     }
+                    PayCompanyManagementTemporary payCompanyManagement = payCompanyManagementTemporaryService.getById(payCommonProject.getChargeCompanyTemporaryId());
+                    if(!Objects.isNull(payCompanyManagement) && "2".equals(payCompanyManagement.getStatus()) ){
+                        return "企业未审核，需要审核后开票";
+                    }
                     break;
                 // 工作组项目
                 case PayIncomeContractCommon.PROJECT_TYPE2:
@@ -335,6 +343,10 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     if(invoiceAmount.compareTo(workingGroup.getReceivableAmount()) == 1){
                         return "开票金额大于当前欠未开票金额，输入有误！";
                     }
+                    PayCompanyManagementTemporary payCompanyManagementWorkingGroup = payCompanyManagementTemporaryService.getById(workingGroup.getChargeCompanyTemporaryId());
+                    if(!Objects.isNull(payCompanyManagementWorkingGroup) && "2".equals(payCompanyManagementWorkingGroup.getStatus()) ){
+                        return "企业未审核，需要审核后开票";
+                    }
                     break;
                 //会议项目
                 case PayIncomeContractCommon.PROJECT_TYPE3:
@@ -356,6 +368,11 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     if(invoiceAmount.compareTo(meeting.getAmountReceivable()) == 1){
                         return "开票金额大于当前欠未开票金额，输入有误！";
                     }
+                    // TODO 缺少会议报名审核状态（非凭证审核的状态）的校验，审核通过的可以来款
+                    PayCompanyManagement payCompanyManagementMeeting = payCompanyManagementService.getById(meeting.getCompanyId());
+                    if(!Objects.isNull(payCompanyManagementMeeting) && "2".equals(payCompanyManagementMeeting.getStatus()) ){
+                        return "企业未审核，需要审核后开票";
+                    }
                     break;
                 //会员项目
                 case PayIncomeContractCommon.PROJECT_TYPE4:
@@ -375,7 +392,11 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     invoiceAmount = oldInvoiceAmount.add(bmpList.get(i).getInvoiceAmount()).setScale(2, BigDecimal.ROUND_HALF_UP);
                     //开票总额>应收
                     if(invoiceAmount.compareTo(memberProject.getAmountReceivable()) == 1){
-                        return "开票金额大于当前欠未开票金额，输入有误！";
+                        return "开票金额大于当前未开票金额，输入有误！";
+                    }
+                    PayCompanyManagementTemporary payCompanyManagementMember = payCompanyManagementTemporaryService.getById(memberProject.getCompanyTemporaryId());
+                    if(!Objects.isNull(payCompanyManagementMember) && "2".equals(payCompanyManagementMember.getStatus()) ){
+                        return "企业未审核，需要审核后开票";
                     }
                     break;
                 //标协会员
@@ -398,15 +419,14 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
                     if(invoiceAmount.compareTo(tbMemberProject.getAmountReceivable()) != 0){
                         return "开票金额应等于当前未开票金额，输入有误！";
                     }
+                    PayCompanyManagement payCompanyManagementTbMember = payCompanyManagementService.getById(tbMemberProject.getCompanyId());
+                    if(!Objects.isNull(payCompanyManagementTbMember) && "2".equals(payCompanyManagementTbMember.getStatus()) ){
+                        return "企业未审核，需要审核后开票";
+                    }
                     break;
                 default:
                     break;
             }
-
-            PayCompanyManagementTemporary payCompanyManagement = payCompanyManagementTemporaryService.getById(standardCompanyId);
-            if("2".equals(payCompanyManagement.getStatus()) ){
-                return "企业名称未审核，需要审核后开票";
-            }
         }
         return "success";
     }
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 1fd8d71c..646f8674 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
@@ -7,8 +7,9 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.util.oConvertUtils;
+import com.jero.company.entity.PayCompanyManagement;
+import com.jero.company.service.IPayCompanyManagementService;
 import com.jero.contract.common.PayIncomeContractCommon;
-import com.jero.home.vo.DataStatisticsVO;
 import com.jero.meeting.entity.PayMeetingSituation;
 import com.jero.meeting.mapper.PayMeetingSituationMapper;
 import com.jero.member.entity.PayMemberProjectSubitem;
@@ -25,17 +26,17 @@ import com.jero.project.mapper.PayCommonProjectMapper;
 import com.jero.project.mapper.PayWorkingGroupSubItemMapper;
 import com.jero.common.util.AuthenticationUtils;
 import com.jero.project.vo.PayCommonProjectOutput;
+import com.jero.temporary.entity.PayCompanyManagementTemporary;
+import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.servlet.ModelAndView;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
@@ -63,8 +64,12 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
     private PayMemberProjectSubitemMapper payMemberProjectSubitemMapper;
     @Resource
     private TbMemberProjectSubitemMapper tbMemberProjectSubitemMapper;
-    @Autowired
+    @Resource
     private ISysBaseAPI sysBaseAPI;
+    @Resource
+    private IPayCompanyManagementTemporaryService payCompanyManagementTemporaryService;
+    @Resource
+    private IPayCompanyManagementService payCompanyManagementService;
 
     @Value("${jero.path.upload}")
     private String upLoadPath;
@@ -140,6 +145,10 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 }else{
                     throw new JeroBootException("到账金额大于当前欠款金额，不可提交！");
                 }
+                PayCompanyManagementTemporary payCompanyManagement = payCompanyManagementTemporaryService.getById(payCommonProject.getChargeCompanyTemporaryId());
+                if(!Objects.isNull(payCompanyManagement) && "2".equals(payCompanyManagement.getStatus()) ){
+                    throw new JeroBootException("企业未审核，需要审核后来款");
+                }
                 break;
             // 工作组项目
             case PayIncomeContractCommon.PROJECT_TYPE2:
@@ -161,6 +170,10 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 }else{
                     throw new JeroBootException("到账金额大于当前欠款金额，不可提交！");
                 }
+                PayCompanyManagementTemporary payCompanyManagementWorkingGroup = payCompanyManagementTemporaryService.getById(payWorking.getChargeCompanyTemporaryId());
+                if(!Objects.isNull(payCompanyManagementWorkingGroup) && "2".equals(payCompanyManagementWorkingGroup.getStatus()) ){
+                    throw new JeroBootException("企业未审核，需要审核后来款");
+                }
                 break;
             //会议项目
             case PayIncomeContractCommon.PROJECT_TYPE3:
@@ -182,6 +195,11 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 }else{
                     throw new JeroBootException("到账金额大于当前欠款金额，不可提交！");
                 }
+                // TODO 缺少会议报名审核状态（非凭证审核的状态）的校验，审核通过的可以开票
+                PayCompanyManagement payCompanyManagementMeeting = payCompanyManagementService.getById(meeting.getCompanyId());
+                if(!Objects.isNull(payCompanyManagementMeeting) && "2".equals(payCompanyManagementMeeting.getStatus()) ){
+                    throw new JeroBootException("企业未审核，需要审核后来款");
+                }
                 break;
             //会员项目
             case PayIncomeContractCommon.PROJECT_TYPE4:
@@ -204,6 +222,10 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 }else{
                     throw new JeroBootException("到账金额大于当前欠款金额，不可提交！");
                 }
+                PayCompanyManagementTemporary payCompanyManagementMember = payCompanyManagementTemporaryService.getById(member.getCompanyTemporaryId());
+                if(!Objects.isNull(payCompanyManagementMember) && "2".equals(payCompanyManagementMember.getStatus()) ){
+                    throw new JeroBootException("企业未审核，需要审核后来款");
+                }
                 break;
             //标协会员
             case PayIncomeContractCommon.PROJECT_TYPE5:
@@ -233,6 +255,10 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 }else{
                     throw new JeroBootException("到账金额大于当前欠款金额，不可提交！");
                 }
+                PayCompanyManagement payCompanyManagementTbMember = payCompanyManagementService.getById(tbMember.getCompanyId());
+                if(!Objects.isNull(payCompanyManagementTbMember) && "2".equals(payCompanyManagementTbMember.getStatus()) ){
+                    throw new JeroBootException("企业未审核，需要审核后来款");
+                }
                 break;
             default:break;
         }