diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingSubitemCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingSubitemCommon.java index 12ed199e..0ad21af2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingSubitemCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingSubitemCommon.java @@ -48,6 +48,10 @@ public class MeetingSubitemCommon { * 合作伙伴嘉宾 */ public final static Integer COOPERATIVE = 4; + /** + * 参展商嘉宾 + */ + public final static Integer EXHIBITOR = 5; /** * 用餐 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayRandomCodeController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayRandomCodeController.java index 6e0dc9d6..949d850c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayRandomCodeController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayRandomCodeController.java @@ -151,6 +151,7 @@ public class PayRandomCodeController extends JeroController { String randomCodeId = item.getRandomCodeId(); @@ -164,6 +165,8 @@ public class PayRandomCodeController extends JeroController randomCodeLinkList = payRandomCodeLinkService.selectByRandomCodeId(randomCodeId); 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 bb73a3c0..eddf212a 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 @@ -198,6 +198,12 @@ public class PayMeeting implements Serializable { @ApiModelProperty(value = "合作伙伴邀请码") private java.lang.String cooperativeInvitationCode; + /**参展商邀请码*/ + @Excel(name = "参展商邀请码", width = 15) + @ApiModelProperty(value = "参展商邀请码") + @Size(max = 50, message = "参展商邀请码最多为50个字符") + private java.lang.String exhibitorInvitationCode; + /**会议费用*/ @Excel(name = "会议费用", width = 15) @ApiModelProperty(value = "会议费用") 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 8e32845f..c7faab36 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 @@ -430,7 +430,7 @@ public class PayMeetingServiceImpl extends ServiceImpl validateReturnList = ValidUtil.validateReturnList(internationalGuestVO); //用餐 @@ -1645,8 +1648,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl validateReturnList = ValidUtil.validateReturnList(internationalGuestVO); //用餐 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 8f3bb878..94fd34be 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 @@ -195,6 +195,12 @@ public class PayMeetingVO implements Serializable { @Size(max = 50, message = "合作伙伴邀请码最多为50个字符",groups = InternationalMeeting.class) private java.lang.String cooperativeInvitationCode; + /**参展商邀请码*/ + @Excel(name = "参展商邀请码", width = 15) + @ApiModelProperty(value = "参展商邀请码") + @Size(max = 50, message = "参展商邀请码最多为50个字符",groups = InternationalMeeting.class) + private java.lang.String exhibitorInvitationCode; + /**会议费用*/ @Excel(name = "会议费用", width = 15) @ApiModelProperty(value = "会议费用") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalMeetingExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalMeetingExcel.java index 1f063d9e..d0f5fb1f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalMeetingExcel.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalMeetingExcel.java @@ -86,6 +86,10 @@ public class InternationalMeetingExcel { @Excel(name = "合作伙伴邀请码", width = 15) private java.lang.String cooperativeInvitationCode; + /**参展商邀请码*/ + @Excel(name = "参展商邀请码", width = 15) + private java.lang.String exhibitorInvitationCode; + /**酒店名称*/ @Excel(name = "酒店名称", width = 15) private String hotelName;