From 35bcde3b44fd833235f9c2e0c54eb8abcc7e5871 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Mon, 1 Nov 2021 14:45:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A5=E6=AC=BE=E6=96=B9=E5=BC=8F=E4=B8=BA?=
 =?UTF-8?q?=E6=B1=87=E6=AC=BE/=E7=8E=B0=E5=9C=BA=E7=BC=B4=E8=B4=B9?=
 =?UTF-8?q?=E7=9A=84=E4=B8=8D=E5=8F=AF=E8=BF=9B=E8=A1=8C=E5=88=B0=E8=B4=A6?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=EF=BC=8C=E6=8F=90=E7=A4=BA=EF=BC=9A=E4=BC=9A?=
 =?UTF-8?q?=E8=AE=AE=E9=A1=B9=E7=9B=AE=E5=9C=A8=E5=8F=82=E4=BC=9A=E4=BA=BA?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E5=90=8E=E4=BC=9A=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E8=87=AA=E5=8A=A8=E5=88=B0=E8=B4=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PayPaymentRecordServiceImpl.java   | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

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 caf14615..25abefb0 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
@@ -233,13 +233,13 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                 if(Objects.isNull(payMeeting)){
                     throw new JeroBootException("会议不存在，不可提交！");
                 }
-                // 会议报名审核状态（非凭证审核的状态）的校验，审核通过的可以开票 (0未审核,1已通过)
-                if(Objects.equals(meeting.getRegisterCheckResult(),0)){
-                    throw new JeroBootException("报名信息未审核，需要审核后来款");
+                // 来款方式为汇款/现场缴费的不可进行到账操作 1为汇款，2为线上缴费
+                if(Objects.equals(meeting.getPayMode(),1) || Objects.equals(meeting.getPayMode(),2)){
+                    throw new JeroBootException("会议项目在参会人审核通过后会系统自动到账！");
                 }
                 PayCompanyManagement payCompanyManagementMeeting = payCompanyManagementService.getById(meeting.getCompanyId());
                 if(!Objects.isNull(payCompanyManagementMeeting) && "2".equals(payCompanyManagementMeeting.getStatus()) ){
-                    throw new JeroBootException("企业未审核，需要审核后来款");
+                    throw new JeroBootException("企业未审核，需要审核后来款！");
                 }
                 principalId = payMeeting.getDirectorId();
                 project = payMeeting.getMeetingName();
@@ -579,7 +579,10 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
             //会议项目
             case PayIncomeContractCommon.PROJECT_TYPE3:
                 PayMeetingSituation meeting = payMeetingSituationMapper.selectById(payPaymentRecord.getProjectId());
-
+                // 来款方式为汇款/现场缴费的不可进行到账操作 1为汇款，2为线上缴费
+                if(Objects.equals(meeting.getPayMode(),1) || Objects.equals(meeting.getPayMode(),2)){
+                    throw new JeroBootException("会议项目在参会人审核通过后会系统自动到账！");
+                }
                 receivableAmount = meeting.getAmountReceivable();//应收
                 paidAmount=meeting.getPaidAmount().subtract(oldRecord.getAmountReceived()).setScale(2, BigDecimal.ROUND_HALF_UP);//实收-上次来款