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/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 meetingContactsList; + + /**身份*/ + @ApiModelProperty(value = "身份") + @TableField(exist = false) + @Dict(dicCode = "meet_identify_type") + private Integer identity; + + /**缴费凭证*/ + @ApiModelProperty(value = "缴费凭证") + @TableField(exist = false) + private String paymentRecord; } 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