Merge remote-tracking branch 'origin/branch2022-1-4' into branch2022-1-4

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";
     /**
      * 未提醒
      */

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();

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;
 }

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();