From a2cdf9af0256dad6f9cb62619ecdb083f826a156 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 29 Dec 2021 17:24:44 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=9B=BD=E9=99=85=E7=A0=94=E8=AE=A8?= =?UTF-8?q?=E4=BC=9A=E9=82=80=E8=AF=B7=E7=A0=81=EF=BC=8C=E6=94=B9=E6=88=90?= =?UTF-8?q?=E9=9D=9E=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PayMeetingServiceImpl.java | 28 ++++++++++++------- .../com/jero/meeting/vo/PayMeetingVO.java | 4 --- 2 files changed, 18 insertions(+), 14 deletions(-) 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 53330643..5a83eedc 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 @@ -352,25 +352,33 @@ public class PayMeetingServiceImpl extends ServiceImpl codeList = new ArrayList<>(); //VIP邀请码 String vipInvitationCode = payMeetingVO.getVipInvitationCode(); - codeList.add(vipInvitationCode); + if (StringUtils.isNotBlank(vipInvitationCode)) { + codeList.add(vipInvitationCode); + } //演讲嘉宾邀请码 String speakerInvitationCode = payMeetingVO.getSpeakerInvitationCode(); - if (codeList.contains(speakerInvitationCode)) { - throw new JeroBootException("邀请码不能重复"); + if (StringUtils.isNotBlank(speakerInvitationCode)) { + if (codeList.contains(speakerInvitationCode)) { + throw new JeroBootException("邀请码不能重复"); + } + codeList.add(speakerInvitationCode); } - codeList.add(speakerInvitationCode); //特邀嘉宾邀请码 String guestInvitationCode = payMeetingVO.getGuestInvitationCode(); - if (codeList.contains(guestInvitationCode)) { - throw new JeroBootException("邀请码不能重复"); + if (StringUtils.isNotBlank(speakerInvitationCode)) { + if (codeList.contains(guestInvitationCode)) { + throw new JeroBootException("邀请码不能重复"); + } + codeList.add(guestInvitationCode); } - codeList.add(guestInvitationCode); //合作伙伴邀请码 String cooperativeInvitationCode = payMeetingVO.getCooperativeInvitationCode(); - if (codeList.contains(cooperativeInvitationCode)) { - throw new JeroBootException("邀请码不能重复"); + if (StringUtils.isNotBlank(speakerInvitationCode)) { + if (codeList.contains(cooperativeInvitationCode)) { + throw new JeroBootException("邀请码不能重复"); + } + codeList.add(cooperativeInvitationCode); } - codeList.add(cooperativeInvitationCode); break; case MeetingCommon.COMMITTEE_MEETING: ValidUtil.validate(payMeetingVO, CaseCommitteeMeeting.class); 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 c25729b7..ed0807af 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 @@ -169,28 +169,24 @@ public class PayMeetingVO implements Serializable { /**VIP邀请码*/ @Excel(name = "VIP邀请码", width = 15) @ApiModelProperty(value = "VIP邀请码") - @NotBlank(message = "VIP邀请码不能为空",groups = InternationalMeeting.class) @Size(max = 50, message = "VIP邀请码最多为50个字符",groups = InternationalMeeting.class) private java.lang.String vipInvitationCode; /**演讲嘉宾邀请码*/ @Excel(name = "演讲嘉宾邀请码", width = 15) @ApiModelProperty(value = "演讲嘉宾邀请码") - @NotBlank(message = "演讲嘉宾邀请码不能为空",groups = InternationalMeeting.class) @Size(max = 50, message = "演讲嘉宾邀请码最多为50个字符",groups = InternationalMeeting.class) private java.lang.String speakerInvitationCode; /**特邀嘉宾邀请码*/ @Excel(name = "特邀嘉宾邀请码", width = 15) @ApiModelProperty(value = "特邀嘉宾邀请码") - @NotBlank(message = "特邀嘉宾邀请码不能为空",groups = InternationalMeeting.class) @Size(max = 50, message = "特邀嘉宾邀请码最多为50个字符",groups = InternationalMeeting.class) private java.lang.String guestInvitationCode; /**合作伙伴邀请码*/ @Excel(name = "合作伙伴邀请码", width = 15) @ApiModelProperty(value = "合作伙伴邀请码") - @NotBlank(message = "合作伙伴邀请码不能为空",groups = InternationalMeeting.class) @Size(max = 50, message = "合作伙伴邀请码最多为50个字符",groups = InternationalMeeting.class) private java.lang.String cooperativeInvitationCode;