From a80bac017a4d77effe01c8b74d8296dec246df05 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 13 Jan 2022 16:52:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=2047280=20=E5=9C=A8=E6=9D=A5=E6=AC=BE?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=B8=AD=E4=BF=AE=E6=94=B9=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BA=E4=BF=A1=E6=81=AF=E4=BA=A4=E6=B5=81?=
 =?UTF-8?q?=E4=BC=9A=E5=90=8E,=E5=9C=A8=E4=BC=9A=E5=91=98=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=AD=E6=B2=A1=E6=9C=89=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/meeting/common/MeetingCommon.java  | 12 ++++++++++++
 .../meeting/service/impl/PayMeetingServiceImpl.java  |  9 +++++++++
 2 files changed, 21 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingCommon.java
index e4c25d86..53fe038e 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingCommon.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingCommon.java
@@ -56,6 +56,18 @@ public class MeetingCommon {
      * 理事会会议
      */
     public final static Integer COUNCIL_MEETING_INT = 6;
+    /**
+     * 标准宣贯
+     */
+    public final static String TB_MEETING_1 = "1";
+    /**
+     * 学习培训
+     */
+    public final static String TB_MEETING_2 = "2";
+    /**
+     * 信息交流会
+     */
+    public final static String TB_MEETING_3 = "3";
     /**
      * 未提醒
      */
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 f4af39bf..514fc1cf 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
@@ -377,6 +377,15 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
                 if (standardMeetingType == null) {
                     throw new JeroBootException("标协会议类型不存在");
                 }
+                if (oldMeeting != null){
+                    //信息交流会是一类,  标准宣贯和学习培训 是一类,  这两类不能护改
+                    if (MeetingCommon.TB_MEETING_3.equals(standardMeetingType)&& !MeetingCommon.TB_MEETING_3.equals(oldMeeting.getTbMeetingType().toString())) {
+                        throw new JeroBootException("标协会议类型不可修改");
+                    }
+                    if (!MeetingCommon.TB_MEETING_3.equals(standardMeetingType)&& MeetingCommon.TB_MEETING_3.equals(oldMeeting.getTbMeetingType().toString())){
+                        throw new JeroBootException("标协会议类型不可修改");
+                    }
+                }
                 payMeeting.setTbMeetingType(Integer.parseInt(tbMeetingType));
                 if (StringUtils.isBlank(payMeetingVO.getStandardsId())){
                     TbMemberProject memberProject = getTbMemberProject();

From f0fd4f7fb31a113b8d29689b1a6b6872d8a288fb Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 13 Jan 2022 17:25:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=E7=AB=AF?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=9A=E8=AE=AE=E5=88=97=E8=A1=A8=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E8=BA=AB=E4=BB=BD=E5=92=8C=E7=BC=B4=E8=B4=B9=E5=87=AD?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/meeting/controller/PayMeetingController.java |  2 ++
 .../main/java/com/jero/meeting/entity/PayMeeting.java | 11 +++++++++++
 2 files changed, 13 insertions(+)

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 085995d3..6f0958cd 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
@@ -153,6 +153,8 @@ public class PayMeetingController extends JeroController<PayMeeting, IPayMeeting
                 meeting.setRegisterCheckResult(registerCheckResult);
                 meeting.setSituationId(meetingSituation.getId());
                 meeting.setPayMode(meetingSituation.getPayMode());
+                meeting.setIdentity(meetingSituation.getIdentity());
+                meeting.setPaymentRecord(meetingSituation.getPaymentRecord());
                 Integer checkResult = meetingSituation.getCheckResult();
                 String paymentRecord = meetingSituation.getPaymentRecord();
                 Integer checkIn = meetingSituation.getCheckIn();
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 7f4883bf..bb73a3c0 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
@@ -325,4 +325,15 @@ public class PayMeeting implements Serializable {
     @ApiModelProperty(value = "会议联系人")
     @TableField(exist = false)
     private List<PayMeetingContacts> meetingContactsList;
+
+    /**身份*/
+    @ApiModelProperty(value = "身份")
+    @TableField(exist = false)
+    @Dict(dicCode = "meet_identify_type")
+    private Integer identity;
+
+    /**缴费凭证*/
+    @ApiModelProperty(value = "缴费凭证")
+    @TableField(exist = false)
+    private String paymentRecord;
 }