From 433cb8c2321398474c426bbcbf461c74e92fbd0f Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 29 Dec 2021 15:45:46 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E4=BC=9A=E8=AE=AE=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/元旦前上线新增.sql                                |  2 +-
 .../java/com/jero/meeting/entity/PayMeeting.java     |  2 +-
 .../com/jero/meeting/mapper/xml/PayMeetingMapper.xml |  5 ++---
 .../meeting/service/impl/PayMeetingServiceImpl.java  | 12 ++++--------
 .../main/java/com/jero/meeting/vo/PayMeetingVO.java  |  2 +-
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/db/元旦前上线新增.sql b/db/元旦前上线新增.sql
index 7ebdc134..e15a9b31 100644
--- a/db/元旦前上线新增.sql
+++ b/db/元旦前上线新增.sql
@@ -1,5 +1,5 @@
 ALTER TABLE `pay_meeting`
-    ADD COLUMN `release` tinyint(1) NULL COMMENT '是否发布' AFTER `remind`;
+    ADD COLUMN is_release tinyint(1) NULL COMMENT '是否发布' AFTER `remind`;
 
 INSERT INTO sys_dict (id, dict_name, dict_code, description, del_flag, create_by, create_time)
 VALUES ('1476073127111663617', '发布状态', 'release', '', 0, 'LKGLZ', '2021-12-29 14:10:32');
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 596ea04d..2808c1cf 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
@@ -265,7 +265,7 @@ public class PayMeeting implements Serializable {
     /**发布状态*/
     @ApiModelProperty(value = "发布状态")
     @Dict(dicCode = "release")
-    private Integer release;
+    private Integer isRelease;
 
     /**收款二维码*/
     @ApiModelProperty(value = "收款二维码")
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml
index a84392ae..8155eb54 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml
@@ -171,9 +171,8 @@
                             NULL AS check_result,
                             NULL AS check_in
                      FROM pay_meeting pm
-                     WHERE (pm.meeting_type = 2
-                        OR pm.meeting_type = 3
-                        OR pm.meeting_type = 4)
+                     WHERE
+                        pm.is_release = 1
                         and pm.id not in (SELECT pm.id
                                     FROM pay_meeting pm
                                     LEFT JOIN pay_meeting_situation pms ON pm.id = pms.meeting_id
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 d8103f04..39ae28c3 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
@@ -390,7 +390,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
             ValidUtil.validate(hotelContacts, StandardMeeting.class);
         }
         BeanUtils.copyProperties(payMeetingVO, payMeeting);
-        payMeeting.setRelease(MeetingCommon.REMIND_0);
+        payMeeting.setIsRelease(MeetingCommon.REMIND_0);
         return payMeeting;
     }
 
@@ -688,17 +688,13 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
             }
         }
 
-        //可报名或者报名状态选择可报名
+        //可报名或者报名状态选择可报名  1可报名/2已报名
         if (Objects.equals(meetingSignUpType, 1 + "")||Objects.equals(signUpStatus,8)) {
             //queryWrapper.ne("pms.company_contact_id",contactId);
             queryWrapper.ge("register_deadline", now);
             queryWrapper.ge("end_time", now);
             queryWrapper.and(
-                            b -> b.eq("pm.meeting_type",MeetingCommon.STANDARD_MEETING)
-                                    .or()
-                                    .eq("pm.meeting_type",MeetingCommon.INTERNATIONAL_MEETING)
-                                    .or()
-                                    .eq("pm.meeting_type",MeetingCommon.OTHER_MEETING)
+                            b -> b.eq("pm.is_release",MeetingCommon.REMIND_1)
                                     .or()
                                     .eq("pmrr.contact_id", contactId)
             );
@@ -1024,6 +1020,6 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
         List<String> meetingIds = publishReminderVO.getMeetingIds();
         LambdaUpdateWrapper<PayMeeting> wrapper = new LambdaUpdateWrapper<>();
         wrapper.in(PayMeeting::getId,meetingIds);
-        wrapper.set(PayMeeting::getRelease,MeetingCommon.REMIND_1);
+        wrapper.set(PayMeeting::getIsRelease,MeetingCommon.REMIND_1);
     }
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
index 29d243c2..c25729b7 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
@@ -270,7 +270,7 @@ public class PayMeetingVO implements Serializable {
     /**发布状态*/
     @ApiModelProperty(value = "发布状态")
     @Dict(dicCode = "release")
-    private Integer release;
+    private Integer isRelease;
 
     /**收款二维码*/
     @ApiModelProperty(value = "收款二维码")