From 7ea8c706da2a654e74a1036cf3e769cc40c9ecc5 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 29 Nov 2021 15:27:00 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E4=BC=81=E4=B8=9A=E7=AB=AF=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E4=BC=9A=E8=AE=AE=E5=A2=9E=E5=8A=A0=E6=8A=A5=E5=90=8D?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayMeetingController.java      | 25 ++++++++++++++++-
 .../com/jero/meeting/entity/PayMeeting.java   |  4 +++
 .../service/impl/PayMeetingServiceImpl.java   | 28 +++++++++++++++++++
 3 files changed, 56 insertions(+), 1 deletion(-)

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 96fcc964..718cffbc 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
@@ -130,9 +130,32 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
             PayMeetingSituation meetingSituation = payMeetingSituationService.getOne(wrapper);
             if (meetingSituation!=null) {
                 meeting.setMeetingSignUpType(2);
-                meeting.setRegisterCheckResult(meetingSituation.getRegisterCheckResult());
+                Integer registerCheckResult = meetingSituation.getRegisterCheckResult();
+                meeting.setRegisterCheckResult(registerCheckResult);
                 meeting.setSituationId(meetingSituation.getId());
                 meeting.setPayMode(meetingSituation.getPayMode());
+                Integer checkResult = meetingSituation.getCheckResult();
+                String paymentRecord = meetingSituation.getPaymentRecord();
+                //报名信息审核中：非成员单位需要审核的
+                if (Objects.equals(registerCheckResult,0)){
+                    meeting.setSignUpStatus(1);
+                //    凭证审核中：非成员单位审核通过/不是非成员单位，来款方式为：汇款/线上缴费上传完凭证的；
+                }else if (Objects.equals(registerCheckResult,1)&&StringUtils.isNotBlank(paymentRecord)){
+                    meeting.setSignUpStatus(2);
+                //    不可参会：非成员单位审核拒绝的
+                }else if (Objects.equals(registerCheckResult,2)){
+                    meeting.setSignUpStatus(3);
+                //    待上传凭证：来款方式为：汇款/线上缴费。需要上传审核凭证的
+                }else if (Objects.equals(registerCheckResult,1)&&StringUtils.isBlank(paymentRecord)){
+                    meeting.setSignUpStatus(4);
+                //    凭证被拒绝：来款方式为：汇款/线上缴费。上传审核凭证被拒绝的
+                }else if (Objects.equals(checkResult,2)){
+                    meeting.setSignUpStatus(5);
+                //    报名成功：不需要审核直接报名成功的;审核凭证通过的
+                }else if (Objects.equals(checkResult,1)){
+                    meeting.setSignUpStatus(6);
+                }
+
             } else {
                 meeting.setMeetingSignUpType(1);
                 meeting.setPayMode(null);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
index 3853453d..c8e07621 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
@@ -291,4 +291,8 @@ public class PayMeeting implements Serializable {
 
     @TableField(exist = false)
     private Integer registerCheckResult;
+
+    @TableField(exist = false)
+    @Dict(dicCode = "sign_up_status")
+    private Integer signUpStatus;
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
index 29b859d8..a7cea7a1 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
@@ -607,6 +607,33 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
         String contactId = sysUser.getId();
 
         queryWrapper.orderByDesc("pm.start_time");
+
+        //
+        Integer signUpStatus = payMeeting.getSignUpStatus();
+        if (Objects.nonNull(signUpStatus)) {
+            switch (signUpStatus){
+                case 1:
+                    queryWrapper.eq("pms.register_check_result",0);
+                    break;
+                case 2:
+                    queryWrapper.eq("pms.register_check_result",1);
+                    queryWrapper.isNotNull("pms.payment_record");
+                    break;
+                case 3:
+                    queryWrapper.eq("pms.register_check_result",2);
+                    break;
+                case 4:
+                    queryWrapper.eq("pms.register_check_result",1);
+                    queryWrapper.isNull("pms.payment_record");
+                    break;
+                case 5:
+                    queryWrapper.eq("pms.check_result",2);
+                    break;
+                case 6:
+                    queryWrapper.eq("pms.check_result",1);
+                    break;
+            }
+        }
         //会议报名状态：1可报名/2已报名
         String meetingSignUpType = request.getParameter("meetingSignUpType");
         if (Objects.equals(meetingSignUpType, 1 + "")) {
@@ -626,6 +653,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
             queryWrapper.having("company_contact_ids not like concat('%',{0},'%') or company_contact_ids is null",contactId);
             return baseMapper.pageListContract(page, queryWrapper, now);
         } else if (Objects.equals(meetingSignUpType, 2 + "")) {
+
             queryWrapper.eq("pms.company_contact_id", contactId);
             return baseMapper.pageListContract2(page, queryWrapper, now);
         } else {