update 国际研讨会邀请码,改成非必填

This commit is contained in:
lijiarao
2021-12-29 17:24:44 +08:00
parent c4ce3e56e2
commit a2cdf9af02
2 changed files with 18 additions and 14 deletions
@@ -352,25 +352,33 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
List<String> codeList = new ArrayList<>(); List<String> codeList = new ArrayList<>();
//VIP邀请码 //VIP邀请码
String vipInvitationCode = payMeetingVO.getVipInvitationCode(); String vipInvitationCode = payMeetingVO.getVipInvitationCode();
codeList.add(vipInvitationCode); if (StringUtils.isNotBlank(vipInvitationCode)) {
codeList.add(vipInvitationCode);
}
//演讲嘉宾邀请码 //演讲嘉宾邀请码
String speakerInvitationCode = payMeetingVO.getSpeakerInvitationCode(); String speakerInvitationCode = payMeetingVO.getSpeakerInvitationCode();
if (codeList.contains(speakerInvitationCode)) { if (StringUtils.isNotBlank(speakerInvitationCode)) {
throw new JeroBootException("邀请码不能重复"); if (codeList.contains(speakerInvitationCode)) {
throw new JeroBootException("邀请码不能重复");
}
codeList.add(speakerInvitationCode);
} }
codeList.add(speakerInvitationCode);
//特邀嘉宾邀请码 //特邀嘉宾邀请码
String guestInvitationCode = payMeetingVO.getGuestInvitationCode(); String guestInvitationCode = payMeetingVO.getGuestInvitationCode();
if (codeList.contains(guestInvitationCode)) { if (StringUtils.isNotBlank(speakerInvitationCode)) {
throw new JeroBootException("邀请码不能重复"); if (codeList.contains(guestInvitationCode)) {
throw new JeroBootException("邀请码不能重复");
}
codeList.add(guestInvitationCode);
} }
codeList.add(guestInvitationCode);
//合作伙伴邀请码 //合作伙伴邀请码
String cooperativeInvitationCode = payMeetingVO.getCooperativeInvitationCode(); String cooperativeInvitationCode = payMeetingVO.getCooperativeInvitationCode();
if (codeList.contains(cooperativeInvitationCode)) { if (StringUtils.isNotBlank(speakerInvitationCode)) {
throw new JeroBootException("邀请码不能重复"); if (codeList.contains(cooperativeInvitationCode)) {
throw new JeroBootException("邀请码不能重复");
}
codeList.add(cooperativeInvitationCode);
} }
codeList.add(cooperativeInvitationCode);
break; break;
case MeetingCommon.COMMITTEE_MEETING: case MeetingCommon.COMMITTEE_MEETING:
ValidUtil.validate(payMeetingVO, CaseCommitteeMeeting.class); ValidUtil.validate(payMeetingVO, CaseCommitteeMeeting.class);
@@ -169,28 +169,24 @@ public class PayMeetingVO implements Serializable {
/**VIP邀请码*/ /**VIP邀请码*/
@Excel(name = "VIP邀请码", width = 15) @Excel(name = "VIP邀请码", width = 15)
@ApiModelProperty(value = "VIP邀请码") @ApiModelProperty(value = "VIP邀请码")
@NotBlank(message = "VIP邀请码不能为空",groups = InternationalMeeting.class)
@Size(max = 50, message = "VIP邀请码最多为50个字符",groups = InternationalMeeting.class) @Size(max = 50, message = "VIP邀请码最多为50个字符",groups = InternationalMeeting.class)
private java.lang.String vipInvitationCode; private java.lang.String vipInvitationCode;
/**演讲嘉宾邀请码*/ /**演讲嘉宾邀请码*/
@Excel(name = "演讲嘉宾邀请码", width = 15) @Excel(name = "演讲嘉宾邀请码", width = 15)
@ApiModelProperty(value = "演讲嘉宾邀请码") @ApiModelProperty(value = "演讲嘉宾邀请码")
@NotBlank(message = "演讲嘉宾邀请码不能为空",groups = InternationalMeeting.class)
@Size(max = 50, message = "演讲嘉宾邀请码最多为50个字符",groups = InternationalMeeting.class) @Size(max = 50, message = "演讲嘉宾邀请码最多为50个字符",groups = InternationalMeeting.class)
private java.lang.String speakerInvitationCode; private java.lang.String speakerInvitationCode;
/**特邀嘉宾邀请码*/ /**特邀嘉宾邀请码*/
@Excel(name = "特邀嘉宾邀请码", width = 15) @Excel(name = "特邀嘉宾邀请码", width = 15)
@ApiModelProperty(value = "特邀嘉宾邀请码") @ApiModelProperty(value = "特邀嘉宾邀请码")
@NotBlank(message = "特邀嘉宾邀请码不能为空",groups = InternationalMeeting.class)
@Size(max = 50, message = "特邀嘉宾邀请码最多为50个字符",groups = InternationalMeeting.class) @Size(max = 50, message = "特邀嘉宾邀请码最多为50个字符",groups = InternationalMeeting.class)
private java.lang.String guestInvitationCode; private java.lang.String guestInvitationCode;
/**合作伙伴邀请码*/ /**合作伙伴邀请码*/
@Excel(name = "合作伙伴邀请码", width = 15) @Excel(name = "合作伙伴邀请码", width = 15)
@ApiModelProperty(value = "合作伙伴邀请码") @ApiModelProperty(value = "合作伙伴邀请码")
@NotBlank(message = "合作伙伴邀请码不能为空",groups = InternationalMeeting.class)
@Size(max = 50, message = "合作伙伴邀请码最多为50个字符",groups = InternationalMeeting.class) @Size(max = 50, message = "合作伙伴邀请码最多为50个字符",groups = InternationalMeeting.class)
private java.lang.String cooperativeInvitationCode; private java.lang.String cooperativeInvitationCode;