From f2d8ce1cec7f96b0ae0a912035b2a9eb582abe02 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 17 Dec 2021 19:16:55 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E4=BC=9A=E8=AE=AE=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E7=8A=B6=E6=80=81=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/meeting/entity/PayMeetingSituation.java    | 2 ++
 .../meeting/service/impl/PayMeetingSituationServiceImpl.java | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
index 42040be1..4fdb94cb 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeetingSituation.java
@@ -442,4 +442,6 @@ public class PayMeetingSituation implements Serializable {
 
     @ApiModelProperty(value = "报名流程")
     private Integer registerProcess;
+
+
 }
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 4eea1f3c..89599111 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
@@ -15,6 +15,7 @@ import com.jero.common.common.ProjectCommon;
 import com.jero.common.dto.SendMessageDTO;
 import com.jero.common.enums.CompanyMessageEnums;
 import com.jero.common.enums.ManagementMessageEnums;
+import com.jero.common.enums.PaymentStatusEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.service.RolePermissionService;
 import com.jero.common.service.SendMessageService;
@@ -464,6 +465,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             }else if (Objects.equals(registerProcess,9)){
                 payMeetingSituation.setRegisterProcess(10);
             }
+            payMeetingSituation.setPaymentStatus(PaymentStatusEnum.REJECTED.getCode());
             updateById(payMeetingSituation);
             //汇款凭证审核不通过
             sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG5, "C_OPEN_TYPE5");
@@ -477,6 +479,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
             }else if (Objects.equals(registerProcess,9)||Objects.equals(registerProcess,10)){
                 payMeetingSituation.setRegisterProcess(11);
             }
+            payMeetingSituation.setPaymentStatus(PaymentStatusEnum.COMPLETED.getCode());
             updateById(payMeetingSituation);
             List<PayPaymentRecord> payPaymentRecords = new ArrayList<>();
             PayPaymentRecord payPaymentRecord = new PayPaymentRecord();
@@ -823,6 +826,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         }else if (Objects.equals(registerProcess,8)){
             payMeetingSituation.setRegisterProcess(9);
         }
+        payMeetingSituation.setPaymentStatus(PaymentStatusEnum.TO_BE_REVIEWED.getCode());
         updateById(payMeetingSituation);
 
         PayMeeting payMeeting = meetingService.getById(meetingId);
@@ -1198,6 +1202,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         if (payMeetingSituation1.getIsZero()) {
             payMeetingSituation1.setRegisterProcess(12);
         }else {
+            payMeetingSituation1.setPaymentStatus(PaymentStatusEnum.TO_BE_UPLOADED.getCode());
             if (Objects.equals(payMeetingSituation1.getRegisterCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)){
                 payMeetingSituation1.setRegisterProcess(3);
             }else {