From 223bb953e8f15e75ef15fb1941ff19963785b9f5 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Sun, 26 Sep 2021 10:01:37 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E4=BC=9A=E8=AE=AE=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayMeetingSituationServiceImpl.java  | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index d3e5e54c..0ed5a5a9 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -246,6 +246,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
      * 工作组会议/分标委会议的非成员单位人报名发送消息 CompanyMessageEnums.MSG2
      * 工作组会议/分标委会议的非成员单位人报名审核允许参会，但是需要上传缴费凭证/订单后四位的发送消息 CompanyMessageEnums.MSG3
      * 既不是非成员单位，也不需要上传缴费凭证的直接发送发送消息 CompanyMessageEnums.MSG4
+     * 汇款凭证审核不通过 CompanyMessageEnums.MSG5
+     * 非成员单位审核通过且上传的缴费凭证审核通过也发送。（即需要审核的都审核通过才发送）CompanyMessageEnums.MSG6
      * @param payMeetingSituation
      * @author lijiarao
      * @date 2021/9/24 17:51
@@ -283,38 +285,46 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
     @Override
     public void check(CheckVO checkVO) {
         String id = checkVO.getId();
-        PayMeetingSituation meetingSituation = getById(id);
-        Integer registerCheckResult = meetingSituation.getRegisterCheckResult();
+        PayMeetingSituation payMeetingSituation = getById(id);
+        String meetingId = payMeetingSituation.getMeetingId();
+        PayMeeting payMeeting = meetingService.getById(meetingId);
+        Integer registerCheckResult = payMeetingSituation.getRegisterCheckResult();
         if (registerCheckResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_0)) {
             throw new JeroBootException("报名信息未审核");
         }
-        String paymentRecord = meetingSituation.getPaymentRecord();
+        String paymentRecord = payMeetingSituation.getPaymentRecord();
         if (StrUtil.isBlank(paymentRecord)) {
             throw new JeroBootException("付款凭证为空不能审核");
         }
-        Integer checkResult1 = meetingSituation.getCheckResult();
+        Integer checkResult1 = payMeetingSituation.getCheckResult();
         if (checkResult1.equals(PayProjectCommon.YES)) {
             throw new JeroBootException("审核通过之后就无法在审核");
         }
         Integer checkResult = checkVO.getCheckResult();
         if (checkResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_2)) {
+            //汇款凭证审核不通过
+            sendMessage(payMeeting, payMeetingSituation,CompanyMessageEnums.MSG5);
+
             //TODO 提示信息
         } else {
             //设置到账
-            //meetingSituation.setInAccount(PayProjectCommon.YES);
+            //payMeetingSituation.setInAccount(PayProjectCommon.YES);
             //设置实收金额
-            //meetingSituation.setPaidAmount(meetingSituation.getAmountReceivable());
-            meetingSituation.setCheckResult(checkResult);
-            saveOrUpdate(meetingSituation);
+            //payMeetingSituation.setPaidAmount(payMeetingSituation.getAmountReceivable());
+            payMeetingSituation.setCheckResult(checkResult);
+            saveOrUpdate(payMeetingSituation);
             List<PayPaymentRecord> payPaymentRecords = new ArrayList<>();
             PayPaymentRecord payPaymentRecord = new PayPaymentRecord();
-            payPaymentRecord.setProjectId(meetingSituation.getId());
+            payPaymentRecord.setProjectId(payMeetingSituation.getId());
             payPaymentRecord.setProjectType(Integer.parseInt(PayIncomeContractCommon.PROJECT_TYPE3));
-            payPaymentRecord.setAmountReceived(meetingSituation.getAmountReceivable());
+            payPaymentRecord.setAmountReceived(payMeetingSituation.getAmountReceivable());
             payPaymentRecord.setPaymentDate(new Date());
             payPaymentRecords.add(payPaymentRecord);
             //添加来款
             payPaymentRecordService.addAmountReceived(payPaymentRecords);
+            //非成员单位审核通过且上传的缴费凭证审核通过也发送。（即需要审核的都审核通过才发送）
+            sendMessage(payMeeting, payMeetingSituation,CompanyMessageEnums.MSG6);
+
         }
     }