From 924b1b09bb0220832f18b2f59293daa19f87198f Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 9 Aug 2024 14:20:46 +0800
Subject: [PATCH] =?UTF-8?q?fix=2088309=20=E3=80=90=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E3=80=91=E4=BC=81=E4=B8=9A=E7=AB=AF--?=
 =?UTF-8?q?=E6=8A=A5=E5=90=8D=E5=90=8E=E7=BC=B4=E8=B4=B9=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E4=BB=8E=E6=89=93=E5=8C=85=E5=88=87=E6=8D=A2=E6=88=90=E6=B1=87?=
 =?UTF-8?q?=E6=AC=BE/=E9=9C=80=E8=A6=81=E7=BC=B4=E8=B4=B9--=E5=88=B0?=
 =?UTF-8?q?=E8=B4=A6=E5=BC=80=E7=A5=A8=E7=9A=84=E7=8A=B6=E6=80=81=E5=92=8C?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=8C=89=E9=92=AE=E6=B2=A1=E6=9C=89=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meeting/common/MeetingSubitemCommon.java  | 14 ++++----
 .../controller/PayMeetingController.java      | 12 ++++---
 .../impl/PayMeetingSituationServiceImpl.java  | 34 ++++++++++++++-----
 3 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingSubitemCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingSubitemCommon.java
index 0ad21af2..cbb39e6e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingSubitemCommon.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingSubitemCommon.java
@@ -94,7 +94,7 @@ public class MeetingSubitemCommon {
      */
     public static final Integer SIGNUP_STATUS_2 = 2;
     /**
-     * 需要缴费-非成员已报名审核
+     * 需要缴费-非成员已报名待审核
      */
     public static final Integer REGISTER_PROCESS_1 = 1;
     /**
@@ -102,7 +102,7 @@ public class MeetingSubitemCommon {
      */
     public static final Integer REGISTER_PROCESS_2 = 2;
     /**
-     * 需要缴费-付款方式为汇款现场缴费
+     * 需要缴费-付款方式为汇款现场缴费 待上传凭证
      */
     public static final Integer REGISTER_PROCESS_3 = 3;
     /**
@@ -122,23 +122,23 @@ public class MeetingSubitemCommon {
      */
     public static final Integer REGISTER_PROCESS_7 = 7;
     /**
-     * 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到
+     * 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到-待上传凭证
      */
     public static final Integer REGISTER_PROCESS_8 = 8;
     /**
-     * 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到
+     * 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到-凭证待审核
      */
     public static final Integer REGISTER_PROCESS_9 = 9;
     /**
-     * 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到
+     * 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到-凭证被拒绝
      */
     public static final Integer REGISTER_PROCESS_10 = 10;
     /**
-     * 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到
+     * 需要缴费-付款方式为汇款 的先签到 但是没有上传凭证 报名状态为已签到-缴费成功
      */
     public static final Integer REGISTER_PROCESS_11 = 11;
     /**
-     * 不需要缴费-非成员已报名审核
+     * 不需要缴费-非成员已报名待审核
      */
     public static final Integer REGISTER_PROCESS_12 = 12;
     /**
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
index 86034ccb..64aa8746 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingController.java
@@ -29,6 +29,7 @@ import com.jero.data.service.IPayCaseCommitteeService;
 import com.jero.data.service.IPayCaseCommitteeSubitemService;
 import com.jero.data.service.IPayCaseCouncilSubitemService;
 import com.jero.meeting.common.MeetingCommon;
+import com.jero.meeting.common.MeetingSubitemCommon;
 import com.jero.meeting.entity.*;
 import com.jero.meeting.mapper.PayMeetingGuestsFileMapper;
 import com.jero.meeting.service.*;
@@ -184,6 +185,7 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
                 Integer checkResult = meetingSituation.getCheckResult();
                 String paymentRecord = meetingSituation.getPaymentRecord();
                 Integer checkIn = meetingSituation.getCheckIn();
+                Integer registerProcess = meetingSituation.getRegisterProcess();
                 //报名信息审核中：非成员单位需要审核的
                 if (Objects.equals(registerCheckResult, 0)) {
                     meeting.setSignUpStatus(1);
@@ -196,9 +198,8 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
                 } else if (Objects.equals(registerCheckResult, 2)) {
                     meeting.setSignUpStatus(3);
                     //    待上传凭证：来款方式为：汇款/线上缴费。需要上传审核凭证的
-                } else if (Objects.equals(registerCheckResult, 1)
-                        && StringUtils.isBlank(paymentRecord)
-                        && !Objects.equals(checkResult, 1)) {
+                } else if (registerProcess.equals(MeetingSubitemCommon.REGISTER_PROCESS_3)
+                        || registerProcess.equals(MeetingSubitemCommon.REGISTER_PROCESS_8)) {
                     meeting.setSignUpStatus(4);
                     //    凭证被拒绝：来款方式为：汇款/线上缴费。上传审核凭证被拒绝的
                 } else if (Objects.equals(checkResult, 2)) {
@@ -206,8 +207,9 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
                     //签到成功的
                 } else if (Objects.equals(checkIn, 1)) {
                     meeting.setSignUpStatus(7);
-                    //    报名成功：不需要审核直接报名成功的;审核凭证通过的
-                } else if (Objects.equals(checkResult, 1)) {
+                    //    待签到 报名成功：不需要审核直接报名成功的;审核凭证通过的
+                } else if (registerProcess.equals(MeetingSubitemCommon.REGISTER_PROCESS_6)
+                        ||registerProcess.equals(MeetingSubitemCommon.REGISTER_PROCESS_14)) {
                     meeting.setSignUpStatus(6);
                 }
 
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 c797ac3c..c9bdff50 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
@@ -569,12 +569,13 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         if (checkResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_2)) {
             payMeetingSituation.setCheckRemark(checkRemark);
 
-            if (Objects.equals(registerProcess,3)||Objects.equals(registerProcess,8)){
+            if (Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_3)
+                    ||Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_8)){
                 throw new JeroBootException("提前审核无法驳回");
             }
-            if (Objects.equals(registerProcess,4)){
+            if (Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_4)){
                 payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_5);
-            }else if (Objects.equals(registerProcess,9)){
+            }else if (Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_9)){
                 payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_10);
             }
             payMeetingSituation.setPaymentStatus(PaymentStatusEnum.REJECTED.getCode());
@@ -586,9 +587,13 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             //payMeetingSituation.setInAccount(PayProjectCommon.YES);
             //设置实收金额
             //payMeetingSituation.setPaidAmount(payMeetingSituation.getAmountReceivable());
-            if (Objects.equals(registerProcess,3)||Objects.equals(registerProcess,4)||Objects.equals(registerProcess,5)){
+            if (Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_3)
+                    ||Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_4)
+                    ||Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_5)){
                 payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_6);
-            }else if (Objects.equals(registerProcess,8)||Objects.equals(registerProcess,9)||Objects.equals(registerProcess,10)){
+            }else if (Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_8)
+                    ||Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_9)
+                    ||Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_10)){
                 payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_11);
             }
             payMeetingSituation.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
@@ -852,11 +857,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             meetingSituation.setCheckFile(signInVO.getFileId());
             meetingSituation.setCheckInTime(new Date());
             Integer registerProcess = meetingSituation.getRegisterProcess();
-            if (Objects.equals(registerProcess,3)){
+            if (Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_3)){
                 meetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_7);
-            }else if (Objects.equals(registerProcess,6)){
+            }else if (Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_6)){
                 meetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_7);
-            }else if (Objects.equals(registerProcess,14)){
+            }else if (Objects.equals(registerProcess,MeetingSubitemCommon.REGISTER_PROCESS_14)){
                 meetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_15);
             }
             saveOrUpdate(meetingSituation);
@@ -1430,6 +1435,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             }
         }
         //展示的流程图
+        String situationId = payMeetingSituation.getId();
         if (payMeetingSituation1.getIsZero()) {
             //如果报名信息审核通过就直接待签到
             if (payMeetingSituation1.getRegisterCheckResult().equals(MeetingSubitemCommon.SIGNUP_STATUS_1)) {
@@ -1437,9 +1443,19 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             }else {
                 payMeetingSituation1.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_12);
             }
+            LambdaUpdateWrapper<PayMeetingSituation> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.eq(PayMeetingSituation::getId,situationId);
+            updateWrapper.set(PayMeetingSituation::getPaymentStatus,null);
+            this.update(updateWrapper);
         }else {
-            if (payMeetingSituation.getId() == null){
+            if (situationId == null){
                 payMeetingSituation1.setPaymentStatus(PaymentStatusEnum.TO_BE_UPLOADED.getCode());
+            }else {
+                PayMeetingSituation old = this.getById(situationId);
+                Integer oldPayMode = old.getPayMode();
+                if (MeetingSubitemCommon.PAY_MODE_3.equals(oldPayMode)){
+                    payMeetingSituation1.setPaymentStatus(PaymentStatusEnum.TO_BE_UPLOADED.getCode());
+                }
             }
             if (Objects.equals(payMeetingSituation1.getRegisterCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
                 payMeetingSituation1.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_3);