From 5a919b5f9ac796d323bb7e574cad1e6a69a73b32 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 18 Nov 2021 10:03:04 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8A=A5?=
 =?UTF-8?q?=E5=90=8D=E4=B9=8B=E5=90=8E=E9=9C=80=E8=A6=81=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E7=9A=84=E6=8A=A5=E5=90=8D=E6=88=90=E5=8A=9F=E7=9A=84=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=BA=94=E8=AF=A5=E8=B7=B3=E8=BD=AC=E5=88=B0=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=AE=A1=E6=A0=B8=E7=9A=84=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayMeetingSituationController.java        | 3 +--
 .../meeting/service/IPayMeetingSituationService.java     | 2 +-
 .../service/impl/PayMeetingSituationServiceImpl.java     | 9 +++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
index a76339cf..24a4aacc 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
@@ -149,8 +149,7 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
     @ApiOperation(value = "报名信息-报名", notes = "报名信息-报名")
     @PostMapping(value = "/signUp")
     public Result<?> signUp(@RequestBody PayMeetingSituation payMeetingSituation) {
-        payMeetingSituationService.signUp(payMeetingSituation);
-        return Result.OK("添加成功！");
+        return Result.OK(payMeetingSituationService.signUp(payMeetingSituation));
     }
 
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java
index 094dd5bb..aacece32 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingSituationService.java
@@ -54,7 +54,7 @@ public interface IPayMeetingSituationService extends IService<PayMeetingSituatio
 
 	void addDock(AddDockVO addDockVO);
 
-    void signUp(PayMeetingSituation payMeetingSituation);
+    boolean signUp(PayMeetingSituation payMeetingSituation);
 
 	void check(CheckVO checkVO);
 
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 86fa2b4e..4c83e515 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
@@ -63,7 +63,6 @@ import com.jero.util.module.ObjRecordUtilModule;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -78,8 +77,6 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.transaction.annotation.Transactional;
 
-import static org.apache.shiro.web.filter.mgt.DefaultFilter.user;
-
 /**
  * @Description: 会议报名信息
  * @Author: jero-boot
@@ -270,9 +267,10 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
 
     /**
      * 报名
+     * @return
      */
     @Override
-    public void signUp(PayMeetingSituation payMeetingSituation) {
+    public boolean signUp(PayMeetingSituation payMeetingSituation) {
         payMeetingSituation.setStatus(MeetingSubitemCommon.STATUS_1);
         String meetingId = payMeetingSituation.getMeetingId();
         PayMeeting payMeeting = meetingService.getById(meetingId);
@@ -314,6 +312,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         signUpSendMessage(payMeetingSituation, payMeeting, payMeetingSituation1);
         //上传付款凭证发送邮件提醒审批
         //SendPaymentRecordMessage(payMeetingSituation1, payMeeting); 报名不上传付款凭证
+        //报名后返回是否不需要审核
+        return Objects.equals(payMeetingSituation.getRegisterCheckResult(), MeetingSubitemCommon.SIGNUP_STATUS_1)
+                && Objects.equals(payMeetingSituation.getCheckResult(), MeetingSubitemCommon.SIGNUP_STATUS_1);
     }
 
     /**