From df9906cea103591f37acdf2f29363fa2fb675f78 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 23 Dec 2021 17:24:09 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=8A=A5=E5=90=8D=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E7=9A=84=E5=80=BC=E6=8F=90=E5=8F=96=E5=87=BA=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meeting/common/MeetingSubitemCommon.java  | 60 +++++++++++++++++++
 .../impl/PayMeetingSituationServiceImpl.java  | 37 +++++++-----
 2 files changed, 81 insertions(+), 16 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 a784b2c9..12ed199e 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
@@ -89,4 +89,64 @@ public class MeetingSubitemCommon {
      * 已驳回
      */
     public static final Integer SIGNUP_STATUS_2 = 2;
+    /**
+     * 需要缴费-非成员已报名审核
+     */
+    public static final Integer REGISTER_PROCESS_1 = 1;
+    /**
+     * 需要缴费-非成员被拒绝
+     */
+    public static final Integer REGISTER_PROCESS_2 = 2;
+    /**
+     * 需要缴费-付款方式为汇款现场缴费
+     */
+    public static final Integer REGISTER_PROCESS_3 = 3;
+    /**
+     * 需要缴费-上传完缴费凭证 待审核
+     */
+    public static final Integer REGISTER_PROCESS_4 = 4;
+    /**
+     * 需要缴费-缴费凭证被拒绝
+     */
+    public static final Integer REGISTER_PROCESS_5 = 5;
+    /**
+     * 需要缴费-凭证审核通过且未签到
+     */
+    public static final Integer REGISTER_PROCESS_6 = 6;
+    /**
+     * 需要缴费-签到完成
+     */
+    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;
+    /**
+     * 不需要缴费-非成员被拒绝
+     */
+    public static final Integer REGISTER_PROCESS_13 = 13;
+    /**
+     * 不需要缴费-待签到
+     */
+    public static final Integer REGISTER_PROCESS_14 = 14;
+    /**
+     * 不需要缴费-已签到
+     */
+    public static final Integer REGISTER_PROCESS_15 = 15;
 }
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 d48d2ddb..e096fd67 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
@@ -461,9 +461,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         if (checkResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_2)) {
             payMeetingSituation.setCheckRemark(checkRemark);
             if (Objects.equals(registerProcess,4)){
-                payMeetingSituation.setRegisterProcess(5);
+                payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_5);
             }else if (Objects.equals(registerProcess,9)){
-                payMeetingSituation.setRegisterProcess(10);
+                payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_10);
             }
             payMeetingSituation.setPaymentStatus(PaymentStatusEnum.REJECTED.getCode());
             updateById(payMeetingSituation);
@@ -475,9 +475,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             //设置实收金额
             //payMeetingSituation.setPaidAmount(payMeetingSituation.getAmountReceivable());
             if (Objects.equals(registerProcess,4)||Objects.equals(registerProcess,5)){
-                payMeetingSituation.setRegisterProcess(6);
+                payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_6);
             }else if (Objects.equals(registerProcess,9)||Objects.equals(registerProcess,10)){
-                payMeetingSituation.setRegisterProcess(11);
+                payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_11);
             }
             payMeetingSituation.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
             updateById(payMeetingSituation);
@@ -540,15 +540,15 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         payMeetingSituation.setRegisterCheckResult(checkResult);
         if (isZeroOrNull(payMeetingSituation.getAmountReceivable())) {
             if (checkResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_1)) {
-                payMeetingSituation.setRegisterProcess(14);
+                payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_14);
             }else {
-                payMeetingSituation.setRegisterProcess(13);
+                payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_13);
             }
         }else {
             if (checkResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_1)) {
-                payMeetingSituation.setRegisterProcess(3);
+                payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_3);
             }else {
-                payMeetingSituation.setRegisterProcess(2);
+                payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_2);
             }
         }
 
@@ -730,11 +730,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             meetingSituation.setCheckInTime(new Date());
             Integer registerProcess = meetingSituation.getRegisterProcess();
             if (Objects.equals(registerProcess,3)){
-                meetingSituation.setRegisterProcess(8);
+                meetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_8);
             }else if (Objects.equals(registerProcess,6)){
-                meetingSituation.setRegisterProcess(7);
+                meetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_7);
             }else if (Objects.equals(registerProcess,14)){
-                meetingSituation.setRegisterProcess(15);
+                meetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_15);
             }
             saveOrUpdate(meetingSituation);
         }
@@ -822,9 +822,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         payMeetingSituation.setCheckResult(0);
         Integer registerProcess = payMeetingSituation1.getRegisterProcess();
         if (Objects.equals(registerProcess,3)){
-            payMeetingSituation.setRegisterProcess(4);
+            payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_4);
         }else if (Objects.equals(registerProcess,8)){
-            payMeetingSituation.setRegisterProcess(9);
+            payMeetingSituation.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_9);
         }
         payMeetingSituation.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
         updateById(payMeetingSituation);
@@ -1200,13 +1200,18 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             }
         }
         if (payMeetingSituation1.getIsZero()) {
-            payMeetingSituation1.setRegisterProcess(12);
+            //如果报名信息审核通过就直接待签到
+            if (payMeetingSituation1.getRegisterCheckResult().equals(MeetingSubitemCommon.SIGNUP_STATUS_1)) {
+                payMeetingSituation1.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_14);
+            }else {
+                payMeetingSituation1.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_12);
+            }
         }else {
             payMeetingSituation1.setPaymentStatus(PaymentStatusEnum.TO_BE_UPLOADED.getCode());
             if (Objects.equals(payMeetingSituation1.getRegisterCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
-                payMeetingSituation1.setRegisterProcess(3);
+                payMeetingSituation1.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_3);
             }else {
-                payMeetingSituation1.setRegisterProcess(1);
+                payMeetingSituation1.setRegisterProcess(MeetingSubitemCommon.REGISTER_PROCESS_1);
             }
         }
         return payMeetingSituation1;