LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 国际研讨会议增加参展商邀请码

Browse Source
This commit is contained in:
lijiarao
2022-07-01 14:42:58 +08:00
parent 3a63e2e6d2
commit aaa08dcbc6
7 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingSubitemCommon.java
+4
View File
@@ -48,6 +48,10 @@ public class MeetingSubitemCommon {
* 合作伙伴嘉宾
*/
public final static Integer COOPERATIVE = 4;
/**
* 参展商嘉宾
*/
public final static Integer EXHIBITOR = 5;
/**
* 用餐
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayRandomCodeController.java
+3
View File
@@ -151,6 +151,7 @@ public class PayRandomCodeController extends JeroController<PayRandomCode, PayR
String speakerInvitationCode = payMeeting.getSpeakerInvitationCode() + "-";
String guestInvitationCode = payMeeting.getGuestInvitationCode() + "-";
String cooperativeInvitationCode = payMeeting.getCooperativeInvitationCode() + "-";
String exhibitorInvitationCode = payMeeting.getExhibitorInvitationCode() + "-";
//处理数据
exportList.forEach(item -> {
String randomCodeId = item.getRandomCodeId();
@@ -164,6 +165,8 @@ public class PayRandomCodeController extends JeroController<PayRandomCode, PayR
invitationCode = guestInvitationCode;
}else if (Objects.equals(MeetingSubitemCommon.COOPERATIVE,guestType)){
invitationCode = cooperativeInvitationCode;
}else if (Objects.equals(MeetingSubitemCommon.EXHIBITOR,guestType)){
invitationCode = exhibitorInvitationCode;
}
List<PayRandomCodeLink> randomCodeLinkList = payRandomCodeLinkService.selectByRandomCodeId(randomCodeId);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
+6
View File
@@ -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 = "会议费用")
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+9 -2
View File
@@ -430,7 +430,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
}
//特邀嘉宾邀请码
String guestInvitationCode = payMeetingVO.getGuestInvitationCode();
if (StringUtils.isNotBlank(speakerInvitationCode)) {
if (StringUtils.isNotBlank(guestInvitationCode)) {
if (codeList.contains(guestInvitationCode)) {
throw new JeroBootException("邀请码不能重复");
}
@@ -438,12 +438,19 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
}
//合作伙伴邀请码
String cooperativeInvitationCode = payMeetingVO.getCooperativeInvitationCode();
if (StringUtils.isNotBlank(speakerInvitationCode)) {
if (StringUtils.isNotBlank(cooperativeInvitationCode)) {
if (codeList.contains(cooperativeInvitationCode)) {
throw new JeroBootException("邀请码不能重复");
}
codeList.add(cooperativeInvitationCode);
}
//参展商邀请码
String exhibitorInvitationCode = payMeetingVO.getExhibitorInvitationCode();
if (StringUtils.isNotBlank(exhibitorInvitationCode)) {
if (codeList.contains(exhibitorInvitationCode)) {
throw new JeroBootException("邀请码不能重复");
}
}
break;
case MeetingCommon.COMMITTEE_MEETING:
ValidUtil.validate(payMeetingVO, CaseCommitteeMeeting.class);
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+8 -5
View File
@@ -346,6 +346,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
String speakerInvitationCode = payMeeting.getSpeakerInvitationCode();
String guestInvitationCode = payMeeting.getGuestInvitationCode();
String cooperativeInvitationCode = payMeeting.getCooperativeInvitationCode();
String exhibitorInvitationCode = payMeeting.getExhibitorInvitationCode();
String[] split = invitationCode.split("-");
if (split.length != 2){
throw new JeroBootException("邀请码有误");
@@ -360,7 +361,9 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
return randomCodeService.validCode(meetingId, MeetingSubitemCommon.GUEST, randomCode, useFlag);
} else if (code.equals(cooperativeInvitationCode)) {
return randomCodeService.validCode(meetingId, MeetingSubitemCommon.COOPERATIVE, randomCode, useFlag);
} else {
} else if (code.equals(exhibitorInvitationCode)) {
return randomCodeService.validCode(meetingId, MeetingSubitemCommon.EXHIBITOR, randomCode, useFlag);
}else {
throw new JeroBootException("邀请码无效");
}
}
@@ -1088,8 +1091,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
}
InternationalGuestVO internationalGuestVO = new InternationalGuestVO();
BeanUtils.copyProperties(payMeetingSituation, internationalGuestVO);
//合作伙伴嘉宾只有最基础的参数所以不需要校验，只需要校验VIP，演讲嘉宾，特邀嘉宾
if (!guestType.equals(MeetingSubitemCommon.COOPERATIVE)) {
//合作伙伴和参展商只有最基础的参数所以不需要校验，只需要校验VIP，演讲嘉宾，特邀嘉宾
if (!guestType.equals(MeetingSubitemCommon.COOPERATIVE) && !guestType.equals(MeetingSubitemCommon.EXHIBITOR)) {
//先校验VIP，演讲嘉宾，特邀嘉宾的公共字段
List<String> validateReturnList = ValidUtil.validateReturnList(internationalGuestVO);
//用餐
@@ -1645,8 +1648,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
InternationalGuestVO internationalGuestVO = new InternationalGuestVO();
BeanUtils.copyProperties(payMeetingSituation, internationalGuestVO);
Integer guestType = payMeetingSituation.getGuestType();
//合作伙伴嘉宾只有最基础的参数所以不需要校验，只需要校验VIP，演讲嘉宾，特邀嘉宾
if (!guestType.equals(MeetingSubitemCommon.COOPERATIVE)) {
//合作伙伴和参展商只有最基础的参数所以不需要校验，只需要校验VIP，演讲嘉宾，特邀嘉宾
if (!guestType.equals(MeetingSubitemCommon.COOPERATIVE) && !guestType.equals(MeetingSubitemCommon.EXHIBITOR)) {
//先校验VIP，演讲嘉宾，特邀嘉宾的公共字段
List<String> validateReturnList = ValidUtil.validateReturnList(internationalGuestVO);
//用餐
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
+6
View File
@@ -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 = "会议费用")
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/InternationalMeetingExcel.java
+4
View File
@@ -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;